Imported Translations from Transifex

Change-Id: I1fffca39a7dc7a5832f0be0505bbadad9a194f48

39 files changed, 51697 insertions, 42460 deletions

diff --git a/nova/locale/bg_BG/LC_MESSAGES/nova.po b/nova/locale/bg_BG/LC_MESSAGES/nova.po
index ae147ad0c..0f0363697 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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) "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index 3fadeed1d..16a8ae37f 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -177,7 +177,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1018,337 +1018,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1371,7 +1376,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1408,31 +1413,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1446,62 +1451,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1582,124 +1587,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1709,261 +1714,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2753,7 +2758,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3066,7 +3071,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3094,34 +3099,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3256,18 +3261,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3305,23 +3327,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3557,30 +3587,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3590,35 +3620,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3639,312 +3669,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3997,52 +4027,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4050,152 +4080,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4253,690 +4283,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5036,11 +5061,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5050,7 +5075,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5143,11 +5168,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5165,44 +5190,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5219,57 +5244,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5293,7 +5318,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5463,23 +5488,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5504,109 +5529,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5614,98 +5639,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5833,7 +5858,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5846,45 +5871,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5905,12 +5930,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6608,7 +6633,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6726,7 +6751,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6765,7 +6790,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7022,71 +7047,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7096,22 +7121,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7177,36 +7202,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7216,25 +7241,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7243,24 +7268,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8028,16 +8053,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8380,12 +8405,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8543,7 +8568,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8562,250 +8587,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8813,73 +8848,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8887,50 +8924,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8940,67 +8977,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9011,25 +9048,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9216,7 +9253,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9253,14 +9290,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9268,7 +9305,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9276,7 +9313,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9284,7 +9321,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9292,87 +9329,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9476,26 +9513,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9641,32 +9678,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9676,39 +9713,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9717,17 +9754,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9748,7 +9785,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9791,57 +9828,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9849,311 +9886,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10216,7 +10252,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10225,12 +10261,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10239,116 +10275,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10364,75 +10395,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10464,7 +10495,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10473,37 +10504,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10514,7 +10545,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10553,332 +10584,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10886,166 +10931,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11054,114 +11094,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11210,24 +11248,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11238,7 +11276,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11291,8 +11329,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/ca/LC_MESSAGES/nova.po b/nova/locale/ca/LC_MESSAGES/nova.po
index fdd080ad2..29627c70f 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Catalan "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index 9602bb2d6..252973929 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr "block_device_list %s"
@@ -183,7 +183,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr "Data páru klíčů jsou neplatná"
 
@@ -1057,342 +1057,347 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:972
 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:972
+#: nova/exception.py:976
 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:976
+#: nova/exception.py:980
 #, 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:980
+#: nova/exception.py:984
 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:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr "Kvóta překročena"
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr "Překročen limit osobnostního souboru"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr "Cesta osobnostního souboru je příliš dlouhá"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr "Obsah osobnostního souboru je příliš dlouhý"
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 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:1028
+#: nova/exception.py:1032
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, 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:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Agregát %(aggregate_id)s nemohl být nalezen."
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Agregát %(aggregate_name)s již existuje."
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, 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:1049
+#: nova/exception.py:1053
 #, 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:1054
+#: nova/exception.py:1058
 #, 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:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr "Nelze vytvořit typ instance"
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, 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:1068
+#: nova/exception.py:1072
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Zjišťěna existující vlan s id %(vlan)"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, 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:1086
+#: nova/exception.py:1090
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Svazek %(volume_id)s nemohl být nastaven."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, 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:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, 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:1118
+#: nova/exception.py:1122
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_id)s nenalezena"
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, 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:1160
+#: nova/exception.py:1164
 #, 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:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, 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:1173
+#: nova/exception.py:1177
 #, 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:1177
+#: nova/exception.py:1181
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password není tímto ovladačem zavedeno"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, 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:1209
+#: nova/exception.py:1213
 #, 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:1214
+#: nova/exception.py:1218
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Očekáván objekt typu: %s"
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1415,7 +1420,7 @@ msgstr "Oznamování schopností plánovačům ..."
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Nelze získat metadata pro ip: %s"
@@ -1453,31 +1458,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "Začínající uzel %(topic)s (verze %(vcs_string)s)"
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "Vytváření připojení zákazníka pro službu %s"
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Ukončena služba bez záznamu v databázi"
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1491,62 +1496,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr "ladění ve zpětném volání: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Adresa místního spojení nenalezena.: %s"
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Nelze získat IP místního spojení %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Neplatná podpůrná vrstva: %s"
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, fuzzy, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr "Neznámý základní soubor: %s"
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Očekáván objekt typu: %s"
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Neplatný  server_string: %s"
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' trvalo %(total_time).2f sek"
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Nelze odstranit kontejner: %s"
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "Název serveru není řetězec nebo unicode"
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, fuzzy, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr "Dvojice klíčů musí být dlouhá 1 až 255 znaků."
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1627,11 +1632,11 @@ msgstr "%(code)s: %(message)s"
 msgid "FaultWrapper: %s"
 msgstr "Obalovačchyb: %s"
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr "Příliš mnoho ověření selhalo."
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1640,114 +1645,114 @@ msgstr ""
 "Přístupový klíč %(access_key)s %(failures)d krát selhal při ověření a "
 "bude zablokován na %(lock_mins)d minut."
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr "Podpis není zadán"
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr "Přístupový klíč není zadán"
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr "Chyba při komunikaci s keystone"
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Přesun před spuštěním selhal na %(dest)s"
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Příliš mnoho ověření selhalo."
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr "činnost: %s"
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\thod: %(value)s"
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "Neoprávnění požadavek pro ovladač=%(controller)s a činnost=%(action)s"
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "Vyvoláno InstanceNenalezena: %s"
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "Vyvoláno SvazekNenalezen: %s"
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "Vyvoláno SnímekNenalzen: %s"
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "Vyvoláno Nenalezeno: %s"
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "Vyvoláno DvojiceKlíčůExistuje: %s"
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, fuzzy, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr "Vyvoláno NeplatnáOperace: %s"
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "Vyvoláno NeplatnáHodnotaParametru: %s"
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "Vyvoláno NeplatnýROzsahPortů: %s"
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "Vyvoláno NeníOprávněno: %s"
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "Vyvoláno NeplatnáOperace: %s"
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Vyvolána neznámá chyba: %s"
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Vyvolána neznámá chyba: %s"
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr "Prostředí: %s"
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Vyskytla se neznámá chyba. Prosím zopakujte Váš požadavek."
@@ -1759,274 +1764,274 @@ msgstr ""
 "Nepodporovaný požadavek API: ovladač = %(controller)s, činnost = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Vytvořit snímek svazku %s"
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Nelze dešifrovat soukromý klíč: %s"
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr "Vytvořit dvojici klíčů %s"
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr "Imprtovat klíč %s"
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Smazat dvojici klíčů %s"
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, 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:623
+#: nova/api/ec2/cloud.py:634
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Neplatný protokol IP %(protocol)s."
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr "Pro zadané parametry není žádné pravidlo."
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Toto pravidlo již existuje ve skupině %s"
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Vytvořit svazek ze snímku %s"
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 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:863
+#: nova/api/ec2/cloud.py:874
 #, fuzzy
 msgid "Delete Failed"
 msgstr "Vytvoření selhalo"
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, 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:887
+#: nova/api/ec2/cloud.py:898
 #, fuzzy
 msgid "Attach Failed."
 msgstr "Vytvoření selhalo"
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Odpojit svazek %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Odpojit svazek %s"
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "vlastnost není podporována: %s"
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr "svz = %s\n"
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "Přidělit adresu"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 #, fuzzy
 msgid "No more floating IPs available"
 msgstr "Žádné další plovoucí ip nejsou dostupné."
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "Uvolnit adresu %s"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 #, fuzzy
 msgid "Unable to release IP Address."
 msgstr "Nelze najít adresu %r"
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, 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:1260
+#: nova/api/ec2/cloud.py:1271
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Nelze najít adresu %r"
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "Je dostupných nula plovoucích ip."
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Nelze najít adresu %r"
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Oddělit adresu %s"
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr "Obraz musí být dostupný"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr "BUde spuštěno ukončování insatncí"
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Restratovat instanci %r"
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr "Instance budou zastaveny"
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr "Instance budou spuštěny"
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr "Zrušení registrace obrazu %s"
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, 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:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr "uživatel nebo skupina nebyly zadány"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "podporována je pouze skupina \"all\""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr "operation_type musí být add nebo remove"
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Aktualizace publicity obrazu %s"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Nelze zastavit instanci za %d sek"
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Získávání seznamu instancí"
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance - %s není přítomno"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Získávání seznamu instancí"
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Neplatná data jednotky"
@@ -2837,7 +2842,7 @@ msgstr "Vlastnost createBackup 'rotation' musí být celé číslo"
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr "Instance nenalezena"
 
@@ -3171,7 +3176,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3200,34 +3205,34 @@ msgstr "Neplatný stav: '%s'"
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, fuzzy, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr "Nastavování hostitele %(host)s na %(state)s."
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Volání pro získání %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Aktualizace statistik hostitele"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource je funkce pouze pro správce"
 
@@ -3368,19 +3373,36 @@ msgstr "Přidávání pravidla bezpečnostní skupiny: %r"
 msgid "Create networks failed"
 msgstr "Vytvoření selhalo"
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
-#, fuzzy, python-format
-msgid "Quota for %s should be integer."
-msgstr "verze by měla být celé číslo"
+#: nova/api/openstack/compute/contrib/quotas.py:152
+#, python-format
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
+msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
 msgid "Malformed scheduler_hints attribute"
@@ -3419,27 +3441,34 @@ msgstr "Není zadána bezpečnostní skupina"
 msgid "Security group name cannot be empty"
 msgstr "Název bezpečnostní skupiny nemůže být prázdné"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 #, fuzzy
 msgid "start instance"
 msgstr "začátek instance %r"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 #, fuzzy
 msgid "stop instance"
 msgstr "zastavit instanci %r"
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "Neznámý řetěz: %r"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 #, fuzzy
 msgid "Unknown service"
 msgstr "neznámá chyby připojení hosta"
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3676,31 +3705,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-#, fuzzy
-msgid "Instance type for vpn instances"
-msgstr "Neplatná instance typu %(instance_type)s."
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr "Šablona pro zaváděcí skript instance cloudpipe"
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr "Síť kterou odeslat do nastavení openvpn"
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr "Síťovou masku kterou odeslat do nastavení openvpn"
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Spouštění VPN pro %s"
@@ -3710,35 +3738,35 @@ msgstr "Spouštění VPN pro %s"
 msgid "Failed to load %s"
 msgstr "Nelze vytvořit svazek"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "prvek není podřazený"
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3761,326 +3789,326 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "obdrženo: %s"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "network"
 msgstr "Reset sítě"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 #, fuzzy
 msgid "IP address"
 msgstr "počáteční adresa"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Bylo nalezeno nula pevných ip."
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "K instanci nejsou přidruženy žádné pevné ip"
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "počáteční adresa"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "projekt"
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 #, fuzzy
 msgid "No networks found"
 msgstr "Síť nenalezena"
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s je vyžadováno pro vytvoření sítě."
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "zastavit instanci %r"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Neočekávaná chyba: %s"
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 #, fuzzy
 msgid "PROJECT"
 msgstr "projekt"
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 #, fuzzy
 msgid "Must supply valid parameters to create instance_type"
 msgstr "Nelze vytvořit typ instance"
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instance - %s není přítomno"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 #, fuzzy
 msgid "Unknown error"
 msgstr "neznámá chyby připojení hosta"
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, fuzzy, python-format
 msgid "%s created"
 msgstr "Tabulka |%s| není vytvořena!"
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 #, fuzzy
 msgid "Valid instance type name is required"
 msgstr "%s je platný název instance"
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "typ je = %s"
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4140,57 +4168,57 @@ msgstr "Bezpečnostní skupina %s by neměla být větší než 255 znaků."
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Nelze připojit svazek k instanci %s"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Chystá se spuštění %s instancí..."
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "BUde spuštěno ukončování insatncí"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, 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:1257
+#: nova/compute/api.py:1258
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "BUde spuštěno ukončování insatncí"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, 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:1310
+#: nova/compute/api.py:1311
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Pokus o jemné smazání %s"
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Pokus o ukončení %s"
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Pokus o zastavení %s"
@@ -4200,21 +4228,21 @@ msgstr "Pokus o zastavení %s"
 msgid "Going to try to start instance"
 msgstr "Pokus o spuštění %s"
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr "Hledání podle: %s"
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Spouštění snímku ve VM %s"
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id je None. Předpokládán přesun."
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4223,63 +4251,63 @@ msgstr ""
 "Stará instance typu %(current_instance_type_name)s, nová instance typu "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, 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:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Pokus o ukončení %s"
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, 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:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Bezpečnostní skupina %s nemůže být prázdná."
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4288,70 +4316,70 @@ msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Délka překračuje maximum "
 "255 znaků."
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, 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:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Vytvořit bezpečnostní skupinu %s"
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Bezpečnostní skupina %s již existuje"
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Nelze zničit vbd %s"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Nelze zničit vbd %s"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Id bezpečnostní skupiny by mělo být celé číslo"
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr "Smazat bezpečnostní skupinu %s"
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Pravidlo (%s) nenalezeno"
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Přidávání pravidla bezpečnostní skupiny: %r"
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Povolit přístup bezpečnostní skupiny %s"
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Zrušit přístup bezpečnostní skupiny %s"
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr "Id bezpečnostní skupiny by mělo být celé číslo"
 
@@ -4410,65 +4438,53 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: 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"
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 #, fuzzy
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr "argumenty create musí být kladná celá čísla"
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "Instance typu %s není nalezena ke smazání"
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4477,234 +4493,241 @@ msgstr ""
 "Nelze přesunout instanci (%(instance_id)s) na současného hostitele "
 "(%(host)s)."
 
-#: nova/compute/manager.py:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Nelze restartovat instanci"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, 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:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Restartování instance po restartu nova-compute."
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Ovladač hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Ovladač hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Neočekávaný kód stavu"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr "Kontrola stavu"
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Nastavování bdm %s"
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr "Spouštění instance..."
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Nenalezeny žádné plovoucí ip"
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr "Instance selhala v nastavení sítě"
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Informace o síti instance: |%s|"
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr "Instance selhala nastavení blokového zařízení"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s nstance"
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr "ukončování bdm %s"
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Nastavování stavu vm instance na ERROR"
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Znovu sestavování instance %s"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, 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:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Vytvořit snímek ze svazku %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Restartování instance %s"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4713,22 +4736,22 @@ msgstr ""
 "pokus o restartování nespuštěné instance: %(instance_uuid)s (stav: "
 "%(state)s očekáváno: %(running)s)"
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "Nelze znovu sestavit instanci [%(instance_uuid)s]: %(exc)s"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: znovu zavedena"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: pořizování snímku"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4737,233 +4760,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:1930
+#: nova/compute/manager.py:1955
 #, 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:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Střídání %d záloh"
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr "Mazání obrazu %s"
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, 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:1977
+#: nova/compute/manager.py:2003
 #, fuzzy
 msgid "Root password set"
 msgstr "Instance %s: Nastavení hesla root"
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 #, 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:1999
+#: nova/compute/manager.py:2025
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password není tímto ovladačem zavedeno"
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Chyba při nastavování hesla správce"
 
-#: nova/compute/manager.py:2019
-#, fuzzy, python-format
+#: nova/compute/manager.py:2045
+#, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
-"pokus o vsunutí souboru do nespuštěné instance: %(instance_uuid)s (stav: "
-"%(current_power_state)s očekáváno: %(expected_state)s)"
 
-#: nova/compute/manager.py:2023
-#, fuzzy, python-format
-msgid "injecting file to %(path)s"
-msgstr "Vkládání cesty souboru: '%s'"
+#: nova/compute/manager.py:2050
+#, python-format
+msgid "injecting file to %s"
+msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: rušení záchrany"
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Nastavování instance %(instance_uuid)s do stavu ERROR"
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instance nemá svazek."
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr "cíl stejný jako zdroj!"
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 #, fuzzy
 msgid "Pausing"
 msgstr "Aktualizování!"
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: získávání diagnostik"
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 #, fuzzy
 msgid "Reset network"
 msgstr "Reset sítě"
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 #, fuzzy
 msgid "Inject network info"
 msgstr "instance %s: vkládání informací o síti"
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info vkládá: |%s|"
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 #, fuzzy
 msgid "Get console output"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 #, fuzzy
 msgid "Getting spice console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, 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:3009
+#: nova/compute/manager.py:3036
 #, 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:3018
+#: nova/compute/manager.py:3046
 #, 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:3033
+#: nova/compute/manager.py:3062
 #, 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:3063
+#: nova/compute/manager.py:3093
 #, 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:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Odpojování svazku z neznámé instance %s"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, 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:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, 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:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "Síť %(network_id)s nemohla být nalezena."
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "Hostitel %(host)s nemohl být nalezen."
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
-msgstr "Přesun před spuštěním selhal na %(dest)s"
+msgid "Pre live migration failed at %s"
+msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "zahájen přesun po spuštění."
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
-msgstr "Přesun instance do %(dest)s úspěšně dokončen."
+msgid "Migrating instance to %s finished successfully."
+msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4971,21 +4992,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:3426
+#: nova/compute/manager.py:3458
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Spuštěna operace po migraci"
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Nelze získat metadata pro ip: %s"
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -4994,64 +5015,64 @@ msgstr ""
 "Nalezeno %(migration_count)d nepotvrzených přesunů starších než "
 "%(confirm_window)d vteřin"
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, 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:3659
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "Instance %(instance_id)s nenalezena"
+#: nova/compute/manager.py:3691
+#, python-format
+msgid "Instance %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Uzel je v neznámém chybovém stavu."
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr "Aktualizace stavu hostitele"
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5060,92 +5081,86 @@ msgstr ""
 "Nalezeno %(num_db_instances)s v databázi a %(num_vm_instances)s na "
 "hypervizoru."
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance není zapnuta"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, překskování..."
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr "Znovu získávání smazané instance"
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Zaznamování ovladače svazku: %s"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 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:4123
-#, fuzzy, python-format
+#: nova/compute/manager.py:4156
+#, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
-"Zjištěna instance se jmenovkou '%(name_label)s', která je označena jako "
-"SMAZÁNA, ale stále je přítomna na hostiteli."
 
-#: nova/compute/manager.py:4130
-#, fuzzy, python-format
+#: nova/compute/manager.py:4162
+#, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
-"Ničení instance se jmenovkou '%(name_label)s', která je označena jako "
-"SMAZÁNA, ale stále je přítomna na hostiteli."
 
-#: nova/compute/manager.py:4137
-#, fuzzy, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+#: nova/compute/manager.py:4169
+#, python-format
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
-"Nerozpoznaná hodnota '%(action)s' pro "
-"FLAGS.running_deleted_instance_action"
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Nastavování instance %(instance_uuid)s do stavu ERROR"
@@ -5247,11 +5262,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr "Nezadán žádný počítačový hostitel"
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "Nelze najít hostitele pro instanci %s"
@@ -5261,7 +5276,7 @@ msgstr "Nelze najít hostitele pro instanci %s"
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5358,11 +5373,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Nelze restartovat instanci"
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Nelze restartovat instanci"
@@ -5381,44 +5396,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Nerozpoznaná hodnota read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5435,57 +5450,57 @@ msgstr "verze by měla být celé číslo"
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 #, fuzzy
 msgid "Unsupported id columns type"
 msgstr "Nepodporovaný Content-Type"
@@ -5511,7 +5526,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, fuzzy, python-format
 msgid "fetching image %s from glance"
 msgstr "Stahování obrazu %s ze serveru obrazu glance"
@@ -5685,23 +5700,23 @@ msgstr "Doména |%(domain)s| již existuje, změna zóny na |%(av_zone)s|."
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "Doména |%(domain)s| již existuje, změna projektu na |%(project)s|."
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr "Tento ovladač podporuje pouze záznamy typu 'a'."
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5728,111 +5743,111 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr "IPTablesManager.použití úspěšně dokončeno"
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, fuzzy, python-format
 msgid "arping error for ip %s"
 msgstr "chyba v httplib v %s: "
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d je starý, znovu spouštění dnsmasq"
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq vrhl výjimku %s"
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d je starý, znovu spouštění dnsmasq"
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "ukončení radvd vrhlo %s"
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d je starý, znovu spouštění radvd"
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Neplatný stav: '%s'"
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Spouštění rozhraní VLAN %s"
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Zajišťování mostu %s"
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Zajišťování vlan %(vlan)s a mostu %(bridge)s"
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Zajišťování mostu %s"
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Zajišťování mostu %s"
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "%s odloučených zastaralých ip"
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr "nastavování hostitele sítě"
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 #, fuzzy
 msgid "network allocations"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, fuzzy, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr "sítě získané pro instanci |%(instance_id)s|: |%(networks)s|"
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 #, fuzzy
 msgid "network deallocation for instance"
 msgstr "oddělení sítě pro instanci |%s|"
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5843,79 +5858,79 @@ msgstr ""
 " Instance |%(instance)s| je v zóně |%(zone2)s|. Nebude vytvořen žádný "
 "záznam DNS."
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, fuzzy, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr "Pro %s překročena kvóta, pokus o přidělení adresy"
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 #, fuzzy
 msgid "Failed to update usages deallocating fixed IP"
 msgstr "Nelze aktualizovat svazek v db"
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Vypůjčená IP |%(address)s|"
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "Vypůjčená IP %s není přidělena"
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "Vypůjčena IP |%s|, která není přidělena"
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Uvolněna IP |%(address)s|"
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "Uvolněna IP %s, která není přidělena"
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "Uvolněna IP %s, která nebyla vypůjčena"
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, fuzzy, python-format
 msgid "%s must be an integer"
 msgstr "parametr offset musí být celé číslo"
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr "cidr je již používáno"
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 "požadovaný cidr (%(cidr)s) je v konfliktu s existující supersítí "
 "(%(super)s)"
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -5924,22 +5939,22 @@ msgstr ""
 "požadovaný cidr (%(cidr)s) je v konfliktu s existujícím menším cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr "Síť již existuje!"
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Síť musí být odloučena od projektu %s před smazáním"
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "Suma mezi počtem sítí a spuštění vlan nemůže být větší než 4094"
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -6072,7 +6087,7 @@ 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:262
+#: nova/network/security_group/quantum_driver.py:263
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Zachycena chyba: %s"
@@ -6087,48 +6102,48 @@ msgstr "Smazat bezpečnostní skupinu %s"
 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:191
+#: nova/network/security_group/quantum_driver.py:192
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Smazat bezpečnostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Zachycena chyba: %s"
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, 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:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, 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:446
+#: nova/network/security_group/quantum_driver.py:444
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6152,12 +6167,12 @@ msgstr "Chyba při nastavování hesla správce"
 msgid "Invalid version string"
 msgstr "Neplatný  server_string: %s"
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6873,7 +6888,7 @@ msgstr "Nelze najít další výpočet"
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: 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"
@@ -6995,7 +7010,7 @@ msgstr "Žádná služba pro ID výpočtu %s"
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "Nelze naplánovat_%(method)s: %(ex)s"
@@ -7034,7 +7049,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7292,7 +7307,7 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 #, fuzzy
 msgid ""
@@ -7300,53 +7315,53 @@ msgid ""
 "instances"
 msgstr "Překročena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr "Spouštění instancí: %s"
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Po ukončení instancí: %s"
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "Po vynuceném ukončení instancí: %s"
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 #, fuzzy
 msgid "spawn error"
 msgstr "neznámá chyby připojení hosta"
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7355,12 +7370,12 @@ msgstr ""
 "Následujícím přesunům chybí snížení na nižší verzi:\n"
 "\t%s"
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, fuzzy, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr "Adresa |%(address)s| není přidělena"
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7370,22 +7385,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, fuzzy, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr "Adresa |%(address)s| není přidělena"
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7455,36 +7470,36 @@ msgstr "Dekódování JSON: %s"
 msgid "fake vswitch not found"
 msgstr "značka [%s] nenalezena"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr "Prosím rozšiřte nepravý modul libvirt aby podporoval příznaky"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, 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:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Odstraňování souborů simulovaného agenta hosta v %s"
@@ -7494,25 +7509,25 @@ msgstr "Odstraňování souborů simulovaného agenta hosta v %s"
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "Zaznamování ovladače svazku: %s"
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Nelze načíst ovladač virtualizace: %s"
@@ -7522,25 +7537,25 @@ msgstr "Nelze načíst ovladač virtualizace: %s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "Pokus o odfiltrování instance, která není filtrována"
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 #, fuzzy
 msgid "Filters added to instance"
 msgstr "Filtry přidány do instance %s"
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr "Pravidla firewallu poskytovatele obnovena"
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr "Přidávání pravidla bezpečnostní skupiny: %r"
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr "Přidávání pravidla poskytovatele: %s"
@@ -8320,17 +8335,17 @@ msgstr "Verze agenta instance: %s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "Aktualizace statistik hostitele"
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 #, fuzzy
 msgid "get_host_stats called"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, fuzzy, python-format
 msgid "Host IP address is: %s"
 msgstr "Uvolnit adresu %s"
@@ -8686,12 +8701,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:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, 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:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Vkládání cesty souboru: '%s'"
@@ -8857,7 +8872,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr "Nelze zjistit název zavaděče iscsi"
 
@@ -8876,262 +8891,272 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, fuzzy, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr "Neůze najít vbd pro vdi %s"
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Připojování k libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "skupina svazku %s neexistuje"
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr "Připojení k libvirt poškozeno"
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Připojování k libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, 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:749
+#: nova/virt/libvirt/driver.py:778
 #, fuzzy
 msgid "During wait destroy, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr "Instance úspěšně zničena."
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Instance budou zastaveny"
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, 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:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, 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:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "Mazání souborů instance %(target)s"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, 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:915
+#: nova/virt/libvirt/driver.py:944
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "Nelze zjistit název zavaděče iscsi"
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "Nelze zjistit název zavaděče iscsi"
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 #, fuzzy
 msgid "During detach_volume, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Źádné sítě nejsou určeny."
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Źádné sítě nejsou určeny."
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Nelze restartovat instanci"
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr "Instance je spuštěna"
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 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:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr "Vytváření obrazu"
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, 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:1930
+#: nova/virt/libvirt/driver.py:1959
 #, 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:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9139,12 +9164,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9153,27 +9185,32 @@ msgstr ""
 "Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9182,35 +9219,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:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "verze libvirt je příliš stará (nepodporuje getVersion)"
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, 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:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9218,21 +9245,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9241,16 +9268,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:3006
+#: nova/virt/libvirt/driver.py:3057
 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:3014
+#: nova/virt/libvirt/driver.py:3065
 #, 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:3059
+#: nova/virt/libvirt/driver.py:3110
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9259,7 +9286,7 @@ msgstr ""
 "Nelze přesunout %(instance_id)s do %(dest)s: Nedostatek disku  "
 "(hostitel:%(available)s <= instance:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9268,7 +9295,7 @@ msgstr ""
 "Spuštěná instance má info o CPU:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9283,7 +9310,7 @@ msgstr ""
 "\n"
 "Prohlédněte si %(u)s"
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9292,24 +9319,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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, 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:3335
+#: nova/virt/libvirt/driver.py:3388
 #, 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:3447
+#: nova/virt/libvirt/driver.py:3500
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9318,42 +9345,42 @@ msgstr ""
 "Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "přeskakování %(path)s protože vypadá jako svazek"
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 #, fuzzy
 msgid "Starting migrate_disk_and_power_off"
 msgstr "Instance %s: Spouštění přesunu disku a vypnutí"
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Instance %s úspěšně běží."
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 #, fuzzy
 msgid "Starting finish_migration"
 msgstr "Instance %s: Spouštění dokončení přesunu"
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 #, fuzzy
 msgid "Starting finish_revert_migration"
 msgstr "Instance %s: Spuštění dokočení vrácení přesunu"
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, fuzzy, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr "Mazání souborů instance %(target)s"
@@ -9366,25 +9393,25 @@ msgstr ""
 "Modul libvirt nemohl být nalezen. NWFilterFirewall nebude správně "
 "fungovat."
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr "Voláno základní nastavení filtrování v nwfilter"
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr "Zajišťování statických filtrů"
 
-#: nova/virt/libvirt/firewall.py:247
+#: 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."
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, 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:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables firewall: Nastavení základního filtrování"
 
@@ -9579,7 +9606,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9617,14 +9644,14 @@ msgstr "Zajišťování mostu %s"
 msgid "Failed while unplugging vif"
 msgstr "Nelze při odpojení vif instance '%s'"
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9632,7 +9659,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9640,7 +9667,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9648,7 +9675,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9656,12 +9683,12 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "iSCSI zařízení v %s nenalezeno"
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, fuzzy, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
@@ -9670,48 +9697,48 @@ msgstr ""
 "ISCSI svazek zatím v %(mount_device)s nenalezen:. Bude znovu provedeno "
 "hledání a další pokus. Číslo pokusu: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, fuzzy, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr "Nalezen uzel iSCSI %(mount_device)s (po %(tries)s pokusech)"
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "obraz již je připojen"
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "iSCSI zařízení v %s nenalezeno"
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, fuzzy, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 "ISCSI svazek zatím v %(mount_device)s nenalezen:. Bude znovu provedeno "
 "hledání a další pokus. Číslo pokusu: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, fuzzy, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr "Nalezen uzel iSCSI %(mount_device)s (po %(tries)s pokusech)"
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 #, fuzzy
 msgid "Fibre Channel device not found."
 msgstr "iSCSI zařízení v %s nenalezeno"
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, fuzzy, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
@@ -9720,30 +9747,30 @@ msgstr ""
 "ISCSI svazek zatím v %(mount_device)s nenalezen:. Bude znovu provedeno "
 "hledání a další pokus. Číslo pokusu: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, fuzzy, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr "Nalezen uzel iSCSI %(mount_device)s (po %(tries)s pokusech)"
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9851,26 +9878,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr "Připojení k melange selhalo"
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -10020,32 +10047,32 @@ msgstr ""
 "Pro useconnection_type=vmwareapi musíte zadat "
 "vmwareapi_host_ip,vmwareapi_host_username a vmwareapi_host_password"
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "značka [%s] nenalezena"
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, 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:540
+#: nova/virt/vmwareapi/driver.py:534
 #, 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:576
+#: nova/virt/vmwareapi/driver.py:570
 #, 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:581
+#: nova/virt/vmwareapi/driver.py:575
 #, 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:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "In vmwareapi:_poll_task, Obdržena tato chyba %s"
@@ -10055,39 +10082,39 @@ msgstr "In vmwareapi:_poll_task, Obdržena tato chyba %s"
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr "Při volání RetrieveProperties se událo %s chyb"
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, 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:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr "Není registrováno žádné VM"
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr "Virtuální stroj s ref %s neexistuje"
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, 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:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr "Sezení je chybné"
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr "Sezení je neplatné"
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " Žádné virtuální stroje nebyly zatím registrovány"
@@ -10097,17 +10124,17 @@ msgstr " Žádné virtuální stroje nebyly zatím registrovány"
 msgid "%(action)s %(host)s"
 msgstr "činnost: %s"
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, fuzzy, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr "Nastavování hostitele %(host)s na %(state)s."
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr "Obraz Glance %s je ve stavu ukončení"
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr "Obraz Glance %(image_id)s je v nezámém stavu - %(state)s"
@@ -10130,7 +10157,7 @@ msgstr "Vytváření skupiny portů s názvem %s na hostiteli ESX"
 msgid "Created Port Group with name %s on the ESX host"
 msgstr "Vytvořena skupina portů s názvem %s na hostiteli ESX"
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, fuzzy, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr "Během uzavření HTTP připojení v VMWareHTTpWrite došlo k výjimce %s"
@@ -10173,17 +10200,17 @@ msgstr "Získávání seznamu instancí"
 msgid "Got total of %s instances"
 msgstr "Získáno celkem %s instancí"
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 #, fuzzy
 msgid "Creating VM on the ESX host"
 msgstr "Vytváření VM s názvem %s na hostiteli ESX"
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 #, fuzzy
 msgid "Created VM on the ESX host"
 msgstr "Vytvářeno VM s názvem %s na hostiteli ESX"
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, fuzzy, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
@@ -10193,7 +10220,7 @@ msgstr ""
 "typem adaptéru %(adapter_type)s na místním úložišti hostitele ESX "
 "%(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, fuzzy, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
@@ -10203,7 +10230,7 @@ msgstr ""
 "typem adaptéru %(adapter_type)s na místním úložišti hostitele ESX "
 "%(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, fuzzy, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
@@ -10212,7 +10239,7 @@ msgstr ""
 "Mazání souboru %(flat_uploaded_vmdk_path)s na místním úložišti hostitele "
 "ESX %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, fuzzy, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
@@ -10221,7 +10248,7 @@ msgstr ""
 "Soubor %(flat_uploaded_vmdk_path)s smazán na místním úložišti hostitele "
 "ESX %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
@@ -10230,7 +10257,7 @@ msgstr ""
 "Stahování dat souboru obrazu %(image_ref)s na datové úložiště hostitele "
 "ESX %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, fuzzy, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
@@ -10239,7 +10266,7 @@ msgstr ""
 "Data souboru obrazu %(image_ref)s stažena na datové úložiště hostitele "
 "ESX %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, fuzzy, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -10250,7 +10277,7 @@ msgstr ""
 "typem adaptéru %(adapter_type)s na místním úložišti hostitele ESX "
 "%(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, fuzzy, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
@@ -10260,139 +10287,133 @@ msgstr ""
 "typem adaptéru %(adapter_type)s na místním úložišti hostitele ESX "
 "%(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 #, fuzzy
 msgid "Powering on the VM instance"
 msgstr "Zapínání instance VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 #, fuzzy
 msgid "Powered on the VM instance"
 msgstr "Instance VM %s zapnuta"
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 #, fuzzy
 msgid "Creating Snapshot of the VM instance"
 msgstr "Vytváření snímku instance VM %s "
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 #, fuzzy
 msgid "Created Snapshot of the VM instance"
 msgstr "Snímek instance VM %s vytvořen "
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 #, fuzzy
 msgid "Copying disk data before snapshot of the VM"
 msgstr "Kopírování data disku před snímek instance VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 #, fuzzy
 msgid "Copied disk data before snapshot of the VM"
 msgstr "Data disku zkopírována před snímek instance VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr "Nahrávání obrazu %s"
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr "Obraz %s nahrán"
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr "Mazání dočasného souboru vmdk %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr "Dočasný soubor vmdk %s smazán"
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr "Instance není zapnuta"
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 #, fuzzy
 msgid "Rebooting guest OS of VM"
 msgstr "Restartování OS hosta na VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 #, fuzzy
 msgid "Rebooted guest OS of VM"
 msgstr "OS hosta restartován na VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 #, fuzzy
 msgid "Doing hard reboot of VM"
 msgstr "Provádění tvrdho restártu VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 #, fuzzy
 msgid "Did hard reboot of VM"
 msgstr "Proveden tvrdý restart VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-#, fuzzy
-msgid "instance not present"
-msgstr "instance - %s není přítomno"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Restartování xvp"
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Registrace VM %s zrušena"
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, fuzzy, python-format
 msgid "In vmwareapi:vmops:delete, 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:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 #, fuzzy
 msgid "Powering off the VM"
 msgstr "Vypínání VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 #, fuzzy
 msgid "Powered off the VM"
 msgstr "VM %s vypnuto"
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 #, fuzzy
 msgid "Unregistering the VM"
 msgstr "Rušení registrace VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 #, fuzzy
 msgid "Unregistered the VM"
 msgstr "Registrace VM %s zrušena"
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr "Ve vmwareapi:vmops:destroy, obdržena výjimka při rušení registrace VM: %s"
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, fuzzy, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr "Mazání obsahu VM %(name)s z datového úložiště %(datastore_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, fuzzy, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr "Smazán obsah VM %(name)s z datového úložiště %(datastore_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
@@ -10401,201 +10422,206 @@ msgstr ""
 "Ve vmwareapi:vmops:destroy, obdržena výjimka při mazání obsahu VM z "
 "disku: %s"
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr "pozastavení není v vmwareapi popdorováno"
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr "zrušení pozastavení není v vmwareapi popdorováno"
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 #, fuzzy
 msgid "Suspending the VM"
 msgstr "Pozastavení VM %s "
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 #, fuzzy
 msgid "Suspended the VM"
 msgstr "VM %s pozastaveno "
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 #, fuzzy
 msgid "instance is powered off and cannot be suspended."
 msgstr "instance je vypnutá, proto nemůže být pozastavena."
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 #, fuzzy
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr "VM %s již je v pozastaveném stavu. Návrat, aniž by se něco provedlo"
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 #, fuzzy
 msgid "Resuming the VM"
 msgstr "Znovu spouštění VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 #, fuzzy
 msgid "Resumed the VM"
 msgstr "VM %s znovu spuštěno "
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr "instance není v pozastaveném stavu"
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 #, fuzzy
 msgid "instance is suspended and cannot be powered off."
 msgstr "Instance není zapnuta"
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 #, fuzzy
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr "VM %s již je v pozastaveném stavu. Návrat, aniž by se něco provedlo"
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 #, fuzzy
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr "VM %s již je v pozastaveném stavu. Návrat, aniž by se něco provedlo"
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 #, fuzzy
 msgid "Powering on the VM"
 msgstr "Vypínání VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 #, fuzzy
 msgid "Powered on the VM"
 msgstr "VM %s vypnuto"
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, 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:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Mazání svazku s ID: %s "
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+#, fuzzy
+msgid "instance not present"
+msgstr "instance - %s není přítomno"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, 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:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Mazání svazku s ID: %s "
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Vytvořit svazek ze snímku %s"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "Automatický tvrdý restart %d"
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr "get_diagnostics není zavedeno pro vmwareapi"
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 #, 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:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 #, 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:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, 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:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, 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:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "Vytváření adresáře s cestou %s"
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr "Vytvořen adresář s cestou %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr "Stahování obrazu %s ze serveru obrazu glance"
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr "Obraz %s stažen ze serveru obrazu glance"
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr "Nahrávání obrazu %s na server obrazu glance"
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr "Obraz %s nahrán na server obrazu glance"
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr "Získávání velikosto brazu %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "Získáná velikost %(size)s obrazu %(image)s"
@@ -10658,7 +10684,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr "Připojeni svazku: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
@@ -10668,12 +10694,12 @@ msgstr "Připojeni svazku: %(connection_info)s, %(instance_name)s, %(mountpoint)
 msgid "Unable to find iSCSI Target"
 msgstr "Nelze najít adresu %r"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Bod připojení %(mountpoint)s připojen k instanci %(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Odpojení svazku: %(instance_name)s, %(mountpoint)s"
@@ -10683,19 +10709,19 @@ msgstr "Odpojení svazku: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "Nelze najít svazek v db"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10704,81 +10730,74 @@ msgstr ""
 "NEZAVEDENO: Volání %(method)s není agentem podporováno. VM "
 "id=%(instance_uuid)s; arg=%(args)r"
 
-#: nova/virt/xenapi/agent.py:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
-#, fuzzy, python-format
+#: nova/virt/xenapi/agent.py:123
+#, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
-"Volání %(method)s agentem vrátilo neplatnou odpověď: %(ret)r. VM "
-"id=%(instance_uuid)s; cesta=%(path)s; arg=%(addl_args)r"
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
-msgstr "Nelze se dotázat na verzi agenta: %(resp)r"
+msgid "Failed to query agent version: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr "Dotaz na verzi agenta"
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Aktualizace agenta na %s"
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
-msgstr "Nelze aktualizovat agenta: %(resp)r"
+msgid "Failed to update agent: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr "Nastavování správcovského hesla"
 
-#: nova/virt/xenapi/agent.py:204
-#, python-format
-msgid "Failed to exchange keys: %(resp)r"
-msgstr "Nelze vyměnit klíče: %(resp)r"
-
-#: nova/virt/xenapi/agent.py:224
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr "Nelze aktualizovat heslo: %(resp)r"
+msgid "Failed to exchange keys: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
-msgstr "Nelze vložit soubor: %(resp)r"
+msgid "Failed to inject file: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr "Reset sítě"
 
-#: nova/virt/xenapi/agent.py:286
-#, fuzzy, python-format
-msgid "Failed to reset network: %(resp)r"
-msgstr "Nelze vložit soubor: %(resp)r"
+#: nova/virt/xenapi/agent.py:290
+#, python-format
+msgid "Failed to reset network: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
@@ -10786,7 +10805,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:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
@@ -10794,15 +10813,15 @@ msgstr ""
 "Nástroje XenServer jsou v tomto obrazu přítomny, ale nejsou schopny "
 "vložit síť"
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr "Nástroje XenServer nejsou v tomto obrazu nainstalovány"
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Chyba OpenSSL: %s"
@@ -10821,75 +10840,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Nelze dešifrovat soukromý klíč: %s"
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr "Spuštění hostitele na XenServer není podporováno."
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 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:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obdržena výjimka: %s"
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr "Oznamování NotImplemented"
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake nemá zavedeno %s"
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
-msgstr "Volání %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr "Volání pro získání %s"
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Volání pro získání %s"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr "xenapi.fake nemá zavedeno %s, nebo byl zavolán se špatným počtem argumentů"
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, fuzzy, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr "Hostitel výpočtu %(host)s nemohl být nalezen."
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10922,7 +10941,7 @@ msgstr "Nalezena sít mostu %s, která není jedinečná"
 msgid "Found no network for bridge %s"
 msgstr "Žádná síť pro most %s nenalezena"
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10931,37 +10950,37 @@ msgstr "Agregát %(aggregate_id)s již má hostitele %(host)s."
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
-#, fuzzy, python-format
-msgid "Unable to join %(host)s in the pool"
-msgstr "Nelze najít hostitele pro instanci %s"
+#, python-format
+msgid "Unable to join %s in the pool"
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
-#, fuzzy, python-format
-msgid "Pool-eject failed: %(e)s"
-msgstr "Nelze vložit soubor: %(resp)r"
+#, python-format
+msgid "Pool-eject failed: %s"
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "Nelze použít globální roli %(role_id)s"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10972,11 +10991,9 @@ msgstr "Nenalezeno žádné PIF pro zařízení %s"
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
-"PIF %(pif_rec['uuid'])s pro síť %(bridge)s má id VLAN %(pif_vlan)d. "
-"Očekáváno %(vlan_num)d"
 
 #: nova/virt/xenapi/vm_utils.py:275
 #, fuzzy
@@ -11015,37 +11032,37 @@ msgstr "již odpojeno"
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Nelze odpojit VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Nelze zničit VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Vytvořeno VBD %(vbd_ref)s pro VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Vytvořeno VBD %(vbd_ref)s pro VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "Nelze zničit VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -11054,100 +11071,112 @@ msgstr ""
 "Vytvořeno VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, "
 "%(read_only)s) na %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "Instance nemohla být nalezena"
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, fuzzy, python-format
 msgid "block device info: %s"
 msgstr "block_device_list %s"
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "Zkopírováno VDI %(vdi_ref)s z VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:638
-#, fuzzy, python-format
-msgid "No primary VDI found for %(vm_ref)s"
-msgstr "Nenalezeno žádné hlavní VDI pro %(vm_ref)s"
+#: nova/virt/xenapi/vm_utils.py:645
+#, python-format
+msgid "No primary VDI found for %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Spouštění snímku ve VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
-"Rychlé kopírování je podporováno pouze na výchozím místním SR typu ext. "
-"SR na tomto systému je typu %(sr_type)s. Ignorování příznaku cow."
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, fuzzy, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr "xapi 'download_vhd' vrátil VDI typu '%(vdi_type)s' s UUID '%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
-#, fuzzy, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
-msgstr "Žádání xapi o získání obrazu vhd %(image)s"
+#: nova/virt/xenapi/vm_utils.py:1135
+#, python-format
+msgid "Asking xapi to fetch vhd image %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, fuzzy, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 "Velkost %(size_bytes) obrazu překračuje povolenou velikost "
 "%(allowed_size_bytes)d typu instance"
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Velikost obrazu %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -11156,64 +11185,64 @@ msgstr ""
 "Obraz Kernel/Ramdisk je příliš velký: %(vdi_size)d bajtů, max "
 "%(max_size)d bajtů"
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Kopírování VDI %s do /boot/guest na dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s zničeno"
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "instance %s: nelze získat obraz glance"
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "Zjištěn formát %(image_type_str)s obrazu %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Hledání vdi %s pro kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
-msgstr "Neznámý formát obrazu %(disk_image_type)s"
+msgid "Unknown image format %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s je stále dostupné"
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Znovu skenování SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "Příznak sr_matching_filter '%s' se neřídí pravidly formátování"
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
@@ -11222,50 +11251,50 @@ msgstr ""
 "XenAPI nelze najít úložiště na které nainstalovat instance hostů. Prosím "
 "zkontrolujte Vaše nastavení a/nebo nastavte příznak 'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr "Nelze najít SR typu obsahu ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
-msgstr "ISO: hledání SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr "ISO: není obsah iso"
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO: typ obsahu iso, není klíč 'i18n-key'"
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO: typ obsahu iso, hodnota i18n-key není 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: SR odpovídající naším kritériím"
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, prozkoumáváno, zdali se jedná o místního hostitele"
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
-msgstr "ISO: PBD %(pbd_ref)s zmizelo"
+msgid "ISO: PBD %s disappeared"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: shoda PBD, požadováno %(pbd_rec)s, získáno %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR s místním PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
@@ -11274,22 +11303,22 @@ msgstr ""
 "Nelze získat RRD XML pro VM %(vm_uuid)s mající podrobnosti serveru: "
 "%(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
-msgstr "Nelze získat aktualizace RRD XML s podrobnostmi serveru: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "Neznámá data statistik od Xenserver: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s má nadřazenho %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -11298,66 +11327,66 @@ msgstr ""
 "Nadřazený %(parent_uuid)s se neshoduje s původním nadřazeným "
 "%(original_parent_uuid)s, čekání na splynutí..."
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
-msgstr "Překročeny pokusy o splynutí VHD (%(max_attempts)d), přerušeno..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Vypršel časový limit při čekání na vytvoření zařízení %s"
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Zapojování VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Zapojování VBD %s hotovo."
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s zapojeno jako %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s zapojeno do špatného dev, znovu mapování do %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Ničení VBD pro VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Ničení VBD pro VDI %s hotovo."
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Spouštění pygrub s %s"
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Nalezen kernel Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Žádný kernel Xen nenalezen. Zavádění HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11365,16 +11394,16 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr "Oddíly:"
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sektorů"
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -11383,158 +11412,153 @@ msgstr ""
 "Zapisování tabulky oddílů %(primary_first)d %(primary_last)d do "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Zapisování tabulky oddílů %s dokončeno."
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr "Přímé zacházení se soubory rozhraní"
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "Nelze připojit souborový systém (očekáváno v nelinuxových instancích): %s"
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
-#, fuzzy, python-format
-msgid "Updating progress to %(progress)d"
-msgstr "Aktualizace postupu instance '%(instance_uuid)s' na %(progress)d"
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
+#, python-format
+msgid "Updating progress to %d"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, fuzzy, python-format
 msgid "Importing image upload handler: %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 #, fuzzy
 msgid "Starting instance"
 msgstr "Spouštění instance..."
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "Odstraňování souborů kernel/ramdisku z dom0"
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, fuzzy, python-format
 msgid "Block device information present: %s"
 msgstr "block_device_mapping %s"
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Nelze aktualizovat svazek v db"
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 #, fuzzy
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 "Automatické nastavení disku pro instanci %(instance_uuid)s, pokus o změnu"
 " velikosti oddílu..."
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 #, fuzzy
 msgid "Starting VM"
 msgstr "Restartování xvp"
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr "Psled v agenta pro %(hypervisor)s/%(os)s/%(architecture)s je %(version)s"
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "Nenalezena žádná verze agenta pro %(hypervisor)s/%(os)s/%(architecture)s"
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "Verze agenta instance: %s"
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr "Nastavování váhy VCPU"
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, fuzzy, python-format
 msgid "Could not find VM with name %s"
 msgstr "Nelze najít odkaz na VDI"
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Dokončen snímek a nahrání na VM %s"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr "Nelze převést vhd na nového hostitele"
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "Nelze restartovat instanci"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Zvětšení velikosti VDI %(vdi_uuid)s z%(old_gb)d GB na %(new_gb)d GB"
@@ -11544,128 +11568,126 @@ msgstr "Zvětšení velikosti VDI %(vdi_uuid)s z%(old_gb)d GB na %(new_gb)d GB"
 msgid "Resize complete"
 msgstr "Změna velikosti %s je hotova"
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 #, fuzzy
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "Neůze najít vbd pro vdi %s"
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "Restartování xvp"
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 #, fuzzy
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 "Instance %(instance_uuid)s pomocí RAW nebo VHD, přeskakování mazání "
 "kernelu a ramdisku"
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "Instance mí kernel nebo ramdisk, ale ne oba"
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr "soubory kernel/ramdisk odstraněny"
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Restartování xvp"
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr "VM není přítomno, přeskakování ničení..."
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "Instance již je v záchranném režimu: %s"
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 #, fuzzy
 msgid "VM is not present, skipping soft delete..."
 msgstr "VM není přítomno, přeskakování ničení..."
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 #, fuzzy
 msgid "Automatically hard rebooting"
 msgstr "Automatický tvrdý restart %d"
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "Vkládání informací o síti do xs pro vm: |%s|"
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 #, fuzzy
 msgid "Creating vifs"
 msgstr "Vytváření obrazu"
 
-#: nova/virt/xenapi/vmops.py:1549
-#, fuzzy, python-format
-msgid "Creating VIF for network %(network_ref)s"
-msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1571
+#, python-format
+msgid "Creating VIF for network %s"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 #, fuzzy
 msgid "Injecting hostname to xenstore"
 msgstr "Vkládání názvu hostitele do xs pro vm: |%s|"
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "Špatný formát sítě"
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 #, fuzzy
 msgid "Migrate Send failed"
 msgstr "Vytvoření selhalo"
 
 #: nova/virt/xenapi/volume_utils.py:51
-#, fuzzy, python-format
-msgid "Creating SR %(label)s"
-msgstr "Vytváření SR %s"
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
-#, fuzzy, python-format
-msgid "Introducing SR %(label)s"
-msgstr "Zavádění SR %s"
+#, python-format
+msgid "Introducing SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
 #, fuzzy
@@ -11715,25 +11737,25 @@ msgstr "Nelze zavést VDI pro SR %s"
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
-#, fuzzy, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
-msgstr "Nelze získat informace o cíli %(data)s, %(mountpoint)s"
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
+#, python-format
+msgid "Unable to obtain target information %s"
+msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
-#, fuzzy, python-format
-msgid "Unable to obtain target information %(connection_data)s"
-msgstr "Nelze získat informace o cíli %(data)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:47
+#, python-format
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "Připojeni svazku: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
-#, fuzzy, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
-msgstr "Instance %(instance_id)s nemohla být nastavena."
+#: nova/virt/xenapi/volumeops.py:143
+#, python-format
+msgid "Skipping detach because VBD for %s was not found"
+msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
 #, python-format
@@ -11743,7 +11765,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, fuzzy, python-format
 msgid "upload_vhd failed: %r"
 msgstr "Neznámý základní soubor: %s"
@@ -11798,8 +11820,236 @@ msgstr "stav musí být dostupný"
 msgid "status must be 'available'"
 msgstr "stav musí být dostupný"
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr "verze by měla být celé číslo"
+
+#~ msgid "Unknown action"
+#~ msgstr "Neznámý řetěz: %r"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr "Neplatná instance typu %(instance_type)s."
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "Nelze znovu sestavit instanci [%(instance_uuid)s]: %(exc)s"
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+#~ "pokus o vsunutí souboru do nespuštěné"
+#~ " instance: %(instance_uuid)s (stav: "
+#~ "%(current_power_state)s očekáváno: %(expected_state)s)"
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr "Vkládání cesty souboru: '%s'"
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "Síť %(network_id)s nemohla být nalezena."
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "Hostitel %(host)s nemohl být nalezen."
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr "Přesun před spuštěním selhal na %(dest)s"
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr "Přesun instance do %(dest)s úspěšně dokončen."
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr "Instance %(instance_id)s nenalezena"
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+#~ "Zjištěna instance se jmenovkou "
+#~ "'%(name_label)s', která je označena jako "
+#~ "SMAZÁNA, ale stále je přítomna na "
+#~ "hostiteli."
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+#~ "Ničení instance se jmenovkou '%(name_label)s',"
+#~ " která je označena jako SMAZÁNA, ale"
+#~ " stále je přítomna na hostiteli."
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+#~ "Nerozpoznaná hodnota '%(action)s' pro "
+#~ "FLAGS.running_deleted_instance_action"
+
+#~ msgid "List of domains returned by libVirt: %s"
 #~ msgstr ""
 
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+#~ "Volání %(method)s agentem vrátilo neplatnou"
+#~ " odpověď: %(ret)r. VM id=%(instance_uuid)s; "
+#~ "cesta=%(path)s; arg=%(addl_args)r"
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr "Nelze se dotázat na verzi agenta: %(resp)r"
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr "Nelze aktualizovat agenta: %(resp)r"
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr "Nelze vyměnit klíče: %(resp)r"
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr "Nelze aktualizovat heslo: %(resp)r"
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr "Nelze vložit soubor: %(resp)r"
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr "Nelze vložit soubor: %(resp)r"
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr "Volání %(localname)s %(impl)s"
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr "Nelze najít hostitele pro instanci %s"
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr "Nelze vložit soubor: %(resp)r"
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "Nelze použít globální roli %(role_id)s"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+#~ "PIF %(pif_rec['uuid'])s pro síť %(bridge)s "
+#~ "má id VLAN %(pif_vlan)d. Očekáváno "
+#~ "%(vlan_num)d"
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr "Nenalezeno žádné hlavní VDI pro %(vm_ref)s"
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+#~ "Rychlé kopírování je podporováno pouze "
+#~ "na výchozím místním SR typu ext. "
+#~ "SR na tomto systému je typu "
+#~ "%(sr_type)s. Ignorování příznaku cow."
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr "Žádání xapi o získání obrazu vhd %(image)s"
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr "Neznámý formát obrazu %(disk_image_type)s"
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr "ISO: hledání SR %(sr_rec)s"
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr "ISO: PBD %(pbd_ref)s zmizelo"
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr "Nelze získat aktualizace RRD XML s podrobnostmi serveru: %(server)s."
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr "Překročeny pokusy o splynutí VHD (%(max_attempts)d), přerušeno..."
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr "Aktualizace postupu instance '%(instance_uuid)s' na %(progress)d"
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr "Vytváření SR %s"
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr "Zavádění SR %s"
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr "Nelze získat informace o cíli %(data)s, %(mountpoint)s"
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr "Nelze získat informace o cíli %(data)s, %(mountpoint)s"
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+#~ "Připojeni svazku: %(connection_info)s, "
+#~ "%(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
+#~ msgstr "Instance %(instance_id)s nemohla být nastavena."
+
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index 8575f507c..1da2abb3b 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -177,7 +177,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1018,337 +1018,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1371,7 +1376,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1408,31 +1413,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1446,62 +1451,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1582,124 +1587,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1709,261 +1714,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2753,7 +2758,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3066,7 +3071,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3094,34 +3099,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3256,18 +3261,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3305,23 +3327,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3557,30 +3587,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3590,35 +3620,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3639,312 +3669,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3997,52 +4027,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4050,152 +4080,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4253,690 +4283,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5036,11 +5061,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5050,7 +5075,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5143,11 +5168,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5165,44 +5190,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5219,57 +5244,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5293,7 +5318,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5463,23 +5488,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5504,109 +5529,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5614,98 +5639,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5833,7 +5858,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5846,45 +5871,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5905,12 +5930,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6608,7 +6633,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6726,7 +6751,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6765,7 +6790,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7022,71 +7047,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7096,22 +7121,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7177,36 +7202,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7216,25 +7241,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7243,24 +7268,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8028,16 +8053,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8380,12 +8405,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8543,7 +8568,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8562,251 +8587,261 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "bind %s: slettet"
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 6061944b5..2561d267f 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -177,7 +177,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, 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:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, 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:1209
+#: nova/exception.py:1213
 #, 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:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,262 +1715,262 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "Instanz %s: Rettung"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2756,7 +2761,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3072,7 +3077,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3100,34 +3105,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3262,18 +3267,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3311,23 +3333,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3564,30 +3594,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3597,35 +3627,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3646,313 +3676,313 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "Instanz %s: Rettung"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4005,53 +4035,53 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, 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:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4059,152 +4089,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4262,697 +4292,692 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Volume %s: erstelle Export"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, 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:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "Instanz %s pausiert"
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5052,11 +5077,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5066,7 +5091,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5159,11 +5184,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5181,44 +5206,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5235,57 +5260,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5309,7 +5334,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5479,23 +5504,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5520,109 +5545,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5630,98 +5655,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5850,7 +5875,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5863,45 +5888,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5922,12 +5947,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6626,7 +6651,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6744,7 +6769,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6783,7 +6808,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7040,71 +7065,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7114,22 +7139,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7195,36 +7220,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7234,25 +7259,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7261,24 +7286,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8051,16 +8076,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8403,12 +8428,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:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8568,7 +8593,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8587,251 +8612,261 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8839,73 +8874,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8913,50 +8950,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8966,67 +9003,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9037,25 +9074,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9242,7 +9279,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9279,14 +9316,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9294,7 +9331,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9302,7 +9339,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9310,7 +9347,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9318,87 +9355,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9502,26 +9539,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9667,32 +9704,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9702,39 +9739,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9743,17 +9780,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9774,7 +9811,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9817,57 +9854,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9875,312 +9912,311 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-#, fuzzy
-msgid "instance not present"
-msgstr "Instanz %s: Rettung"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+#, fuzzy
+msgid "instance not present"
+msgstr "Instanz %s: Rettung"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10243,7 +10279,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10253,12 +10289,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10268,116 +10304,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10393,75 +10424,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10493,7 +10524,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10502,37 +10533,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10543,7 +10574,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10582,332 +10613,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10915,167 +10960,162 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11084,114 +11124,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11241,24 +11279,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11269,7 +11307,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11322,8 +11360,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "Instanz %s pausiert"
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index b65e32f3d..7b7678563 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1024,337 +1024,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Could not attach image to loopback: %s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Could not attach image to loopback: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Going to try to terminate %s"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Going to try to terminate %s"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, 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:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1377,7 +1382,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Failed to get metadata for ip: %s"
@@ -1415,31 +1420,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "Starting %(topic)s node (version %(vcs_string)s)"
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Service killed that has no database entry"
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1453,62 +1458,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1589,11 +1594,11 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr "Too many failed authentications."
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1602,114 +1607,114 @@ msgstr ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Authentication Failure: %s"
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Too many failed authentications."
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "Unauthorised request for controller=%(controller)s and action=%(action)s"
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "An unknown error has occurred. Please try your request again."
@@ -1719,265 +1724,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:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair %s"
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair %s"
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, 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:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr "No rule for the specified parameters."
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "This rule already exists in group %s"
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 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:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, 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:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribute not supported: %s"
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "Allocate address"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "Release address %s"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, 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:1260
+#: nova/api/ec2/cloud.py:1271
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr "Going to start terminating instances"
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance %r"
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image %s"
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, 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:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr "user or group not specified"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "only group \"all\" is supported"
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr "operation_type must be add or remove"
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Updating image %s publicity"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: rescued"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2773,7 +2778,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3094,7 +3099,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3123,34 +3128,34 @@ msgstr "Invalid backend: %s"
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Calling getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Calling getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3287,18 +3292,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr "setting network host"
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
+#, python-format
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
 #, python-format
-msgid "Quota for %s should be integer."
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3337,26 +3359,33 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 #, fuzzy
 msgid "start instance"
 msgstr "Reboot instance %r"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 #, fuzzy
 msgid "stop instance"
 msgstr "Reboot instance %r"
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "action: %s"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3593,31 +3622,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-#, fuzzy
-msgid "Instance type for vpn instances"
-msgstr "Get console output for instance %s"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr "Network to push into openvpn config"
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr "Netmask to push into openvpn config"
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Launching VPN for %s"
@@ -3627,35 +3655,35 @@ msgstr "Launching VPN for %s"
 msgid "Failed to load %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3676,320 +3704,320 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "received %s"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Caught error: %s"
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "network"
 msgstr "setting network host"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 #, fuzzy
 msgid "IP address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "group %s already exists"
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 #, fuzzy
 msgid "No networks found"
 msgstr "setting network host"
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "Reboot instance %r"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Unexpected error raised: %s"
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instance %s: rescued"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "Caught error: %s"
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4043,57 +4071,57 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "instance %s: booted"
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Going to try to terminate %s"
@@ -4103,153 +4131,153 @@ msgstr "Going to try to terminate %s"
 msgid "Going to try to start instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorise security group ingress %s"
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4308,711 +4336,706 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Going to start terminating instances"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Unexpected error raised: %s"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "setting network host"
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Detach volume %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "Running instances: %s"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: rebooted"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
-#, fuzzy, python-format
-msgid "injecting file to %(path)s"
-msgstr "Injecting file path: '%s'"
+#: nova/compute/manager.py:2050
+#, python-format
+msgid "injecting file to %s"
+msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: unrescuing"
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 #, fuzzy
 msgid "Reset network"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 #, fuzzy
 msgid "Inject network info"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, 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:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, 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:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "instance %s: booted"
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "instance %s: booted"
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Deleting user %s"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: booted"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Deleting user %s"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5112,11 +5135,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5126,7 +5149,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5220,11 +5243,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5242,44 +5265,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5296,57 +5319,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5370,7 +5393,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5541,23 +5564,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5582,109 +5605,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq threw %s"
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "killing radvd threw %s"
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Invalid backend: %s"
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Error starting xvp: %s"
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr "setting network host"
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5692,92 +5715,92 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s released that was not leased"
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -5785,7 +5808,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5915,7 +5938,7 @@ 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:262
+#: nova/network/security_group/quantum_driver.py:263
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Caught error: %s"
@@ -5930,46 +5953,46 @@ msgstr "Delete security group %s"
 msgid "Security group id should be uuid"
 msgstr "Revoke security group ingress %s"
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Authorise security group ingress %s"
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5990,12 +6013,12 @@ msgstr "Error starting xvp: %s"
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6698,7 +6721,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6816,7 +6839,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6855,7 +6878,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7112,71 +7135,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "After terminating instances: %s"
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7186,22 +7209,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7268,36 +7291,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr "setting network host"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7307,25 +7330,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7334,24 +7357,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8130,17 +8153,17 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 #, fuzzy
 msgid "get_host_stats called"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, fuzzy, python-format
 msgid "Host IP address is: %s"
 msgstr "Release address %s"
@@ -8486,12 +8509,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:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, 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:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Injecting file path: '%s'"
@@ -8657,7 +8680,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8676,254 +8699,264 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "volume group %s doesn't exist"
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Going to try to terminate %s"
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: rebooted"
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, 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:1930
+#: nova/virt/libvirt/driver.py:1959
 #, 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:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8931,73 +8964,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, 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:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9005,50 +9040,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9058,67 +9093,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Authentication Failure: %s"
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9129,25 +9164,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9334,7 +9369,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9371,14 +9406,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9386,7 +9421,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9394,7 +9429,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9402,7 +9437,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9410,87 +9445,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "group %s already exists"
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9595,26 +9630,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9760,32 +9795,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9795,39 +9830,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9836,17 +9871,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr "action: %s"
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9867,7 +9902,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9910,57 +9945,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9968,318 +10003,317 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 #, fuzzy
 msgid "Powering on the VM instance"
 msgstr "Going to run %s instances..."
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 #, fuzzy
 msgid "Creating Snapshot of the VM instance"
 msgstr "Creating a raw instance"
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-#, fuzzy
-msgid "instance not present"
-msgstr "instance %s: rescued"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Restarting xvp"
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Nested return %s"
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 #, fuzzy
 msgid "Unregistering the VM"
 msgstr "De-registering image %s"
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 #, fuzzy
 msgid "Powering on the VM"
 msgstr "Going to run %s instances..."
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "instance %s: booted"
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Deleting user %s"
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+#, fuzzy
+msgid "instance not present"
+msgstr "instance %s: rescued"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Deleting user %s"
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10342,7 +10376,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10352,12 +10386,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
@@ -10367,116 +10401,111 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
-#, python-format
-msgid "Failed to exchange keys: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:224
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to update password: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
-#, fuzzy, python-format
-msgid "Failed to reset network: %(resp)r"
-msgstr "Failed to get metadata for ip: %s"
+#: nova/virt/xenapi/agent.py:290
+#, python-format
+msgid "Failed to reset network: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
@@ -10496,54 +10525,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, 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:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
-msgstr "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10552,21 +10581,21 @@ msgstr ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10598,7 +10627,7 @@ msgstr "Found non-unique network for bridge %s"
 msgid "Found no network for bridge %s"
 msgstr "Found no network for bridge %s"
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10607,37 +10636,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "Unable to detach volume %s"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10648,7 +10677,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10687,37 +10716,37 @@ msgstr "group %s already exists"
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10726,230 +10755,244 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
-#, fuzzy, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
-msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
+#: nova/virt/xenapi/vm_utils.py:1135
+#, python-format
+msgid "Asking xapi to fetch vhd image %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Registered image %(image_location)s with id %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -10958,66 +11001,66 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11025,170 +11068,165 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, fuzzy, python-format
 msgid "Importing image upload handler: %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 #, fuzzy
 msgid "Starting instance"
 msgstr "Creating a raw instance"
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 #, fuzzy
 msgid "Starting VM"
 msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Finished snapshot and upload for VM %s"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "Going to start terminating instances"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11197,118 +11235,116 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr "kernel/ramdisk files removed"
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "setting network host"
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
-#, fuzzy, python-format
-msgid "Creating VIF for network %(network_ref)s"
-msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1571
+#, python-format
+msgid "Creating VIF for network %s"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
-#, fuzzy, python-format
-msgid "Creating SR %(label)s"
-msgstr "setting network host"
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
-#, fuzzy, python-format
-msgid "Introducing SR %(label)s"
-msgstr "Introducing %s..."
+#, python-format
+msgid "Introducing SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
 #, fuzzy
@@ -11357,24 +11393,24 @@ msgstr "Unable to introduce VDI for SR %s"
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11385,7 +11421,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, fuzzy, python-format
 msgid "upload_vhd failed: %r"
 msgstr "NotFound raised: %s"
@@ -11438,8 +11474,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr "action: %s"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr "Get console output for instance %s"
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "Running instances: %s"
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr "Injecting file path: '%s'"
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "instance %s: booted"
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "instance %s: booted"
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr "Failed to get metadata for ip: %s"
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr "Calling %(localname)s %(impl)s"
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "Unable to detach volume %s"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr "setting network host"
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr "Introducing %s..."
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index d79d0fd61..bd9e003ac 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -177,7 +177,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
@@ -1024,337 +1024,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, 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:1086
+#: nova/exception.py:1090
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, 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:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, 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:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, 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:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1377,7 +1382,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1414,31 +1419,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1452,62 +1457,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1588,124 +1593,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1715,262 +1720,262 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: resuming"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Invalid cidr %(cidr)s."
@@ -2765,7 +2770,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3083,7 +3088,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3111,34 +3116,34 @@ msgstr "Invalid backend: %s"
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Calling getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Calling getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3274,18 +3279,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
+#, python-format
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
 #, python-format
-msgid "Quota for %s should be integer."
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3323,24 +3345,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "An unknown exception occurred."
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3577,31 +3606,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-#, fuzzy
-msgid "Instance type for vpn instances"
-msgstr "Invalid instance type %(instance_type)s."
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3611,35 +3639,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3660,315 +3688,315 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "network"
 msgstr "instance %s: reset network"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "Rebooting instance %s"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instance %s: resuming"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4021,54 +4049,54 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Virtual Interface creation failed"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, 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:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4076,152 +4104,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4280,704 +4308,699 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "volume %s: creating export"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "VBD not found in instance %s"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 #, fuzzy
 msgid "Reset network"
 msgstr "instance %s: reset network"
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, 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:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, 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:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "instance %s: snapshotting"
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "Instance %(instance_id)s is not running."
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "Instance %(instance_id)s is not running."
+#: nova/compute/manager.py:3691
+#, python-format
+msgid "Instance %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Re-exporting %s volumes"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Invalid instance type %(instance_type)s."
@@ -5077,11 +5100,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5091,7 +5114,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5185,11 +5208,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5207,44 +5230,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5261,57 +5284,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5335,7 +5358,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5505,23 +5528,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5546,109 +5569,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq threw %s"
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "killing radvd threw %s"
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Invalid backend: %s"
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5656,98 +5679,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5877,7 +5900,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5890,45 +5913,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5949,12 +5972,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6659,7 +6682,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: 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."
@@ -6777,7 +6800,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6816,7 +6839,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7073,71 +7096,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7147,22 +7170,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7228,36 +7251,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7267,25 +7290,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7294,24 +7317,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8086,17 +8109,17 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 #, fuzzy
 msgid "get_host_stats called"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8442,12 +8465,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:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8613,7 +8636,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8632,252 +8655,262 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connection to melange failed"
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: created successfully"
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 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:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, 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:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8885,73 +8918,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8959,50 +8994,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9012,67 +9047,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9083,25 +9118,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9288,7 +9323,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9325,14 +9360,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9340,7 +9375,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9348,7 +9383,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9356,7 +9391,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9364,87 +9399,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9550,26 +9585,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr "Connection to melange failed"
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9716,32 +9751,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9751,39 +9786,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9792,17 +9827,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9823,7 +9858,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9866,57 +9901,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9924,313 +9959,312 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-#, fuzzy
-msgid "instance not present"
-msgstr "instance %s: resuming"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Nested return %s"
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, 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:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+#, fuzzy
+msgid "instance not present"
+msgstr "instance %s: resuming"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10293,7 +10327,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10303,12 +10337,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
@@ -10318,116 +10352,111 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
-#, python-format
-msgid "Failed to exchange keys: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:224
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to update password: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10443,54 +10472,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, 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:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
-msgstr "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10499,21 +10528,21 @@ msgstr ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, fuzzy, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr "Instance %(instance_id)s is not running."
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10545,7 +10574,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10554,37 +10583,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "Unable to detach volume %s"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10595,7 +10624,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10634,37 +10663,37 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10673,229 +10702,243 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
-#, fuzzy, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
-msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
+#: nova/virt/xenapi/vm_utils.py:1135
+#, python-format
+msgid "Asking xapi to fetch vhd image %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -10904,66 +10947,66 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10971,168 +11014,163 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, fuzzy, python-format
 msgid "Importing image upload handler: %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 #, fuzzy
 msgid "Starting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "Rebooting instance %s"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11141,114 +11179,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
-#, fuzzy, python-format
-msgid "Creating VIF for network %(network_ref)s"
-msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1571
+#, python-format
+msgid "Creating VIF for network %s"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
-#, fuzzy, python-format
-msgid "Creating SR %(label)s"
-msgstr "Re-exporting %s volumes"
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11298,25 +11334,25 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
-#, fuzzy, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
-msgstr "Instance %(instance_id)s is not running."
+#: nova/virt/xenapi/volumeops.py:143
+#, python-format
+msgid "Skipping detach because VBD for %s was not found"
+msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
 #, python-format
@@ -11326,7 +11362,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11379,8 +11415,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr "An unknown exception occurred."
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr "Invalid instance type %(instance_type)s."
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "VBD not found in instance %s"
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 #~ msgstr ""
 
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "instance %s: snapshotting"
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "Instance %(instance_id)s is not running."
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr "Instance %(instance_id)s is not running."
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr "Calling %(localname)s %(impl)s"
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "Unable to detach volume %s"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr "Re-exporting %s volumes"
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
+#~ msgstr "Instance %(instance_id)s is not running."
+
diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index 944933d3a..de94f2fee 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr "block_device_list %s"
@@ -180,7 +180,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
@@ -1060,32 +1060,37 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:972
 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:972
+#: nova/exception.py:976
 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:976
+#: nova/exception.py:980
 #, 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:980
+#: nova/exception.py:984
 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:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "No valid host was found. %(reason)s"
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr "Quota exceeded"
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
@@ -1094,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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr "Maximum number of floating ips exceeded"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Maximum number of floating ips exceeded"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Maximum number of metadata items exceeds %(allowed)d"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr "Personality file limit exceeded"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr "Personality file path too long"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr "Personality file content too long"
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr "Maximum number of key pairs exceeded"
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Maximum number of security groups or rules exceeded"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
@@ -1137,125 +1142,125 @@ msgstr ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Aggregate %(aggregate_id)s could not be found."
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Aggregate %(aggregate_name)s already exists."
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, 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:1049
+#: nova/exception.py:1053
 #, 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:1054
+#: nova/exception.py:1058
 #, 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:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr "Unable to create instance type"
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, 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:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Detected existing vlan with id %(vlan)d"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s could not be found."
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, 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:1086
+#: nova/exception.py:1090
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Volume %(volume_id)s could not be found."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, 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:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Marker %(marker)s could not be found."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr "Invalid id: %(val)s (expecting \"i-...\")."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Could not fetch image %(image_id)s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Could not fetch image %(image_id)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, 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:1114
+#: nova/exception.py:1118
 #, 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:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_uuid)s is locked"
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, 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:1127
+#: nova/exception.py:1131
 #, 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:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
@@ -1264,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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr "User data needs to be valid base 64."
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
@@ -1277,19 +1282,19 @@ msgstr ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, 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:1160
+#: nova/exception.py:1164
 #, 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:1164
+#: nova/exception.py:1168
 #, fuzzy, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
@@ -1298,111 +1303,111 @@ msgstr ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, 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:1173
+#: nova/exception.py:1177
 #, 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:1177
+#: nova/exception.py:1181
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password is not implemented by this driver."
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, 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:1209
+#: nova/exception.py:1213
 #, 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:1214
+#: nova/exception.py:1218
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Instance Type with name %(name)s already exists."
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Expected object of type: %s"
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1425,7 +1430,7 @@ msgstr "Notifying Schedulers of capabilities ..."
 msgid "Failed to send state update notification"
 msgstr "Failed to send state update notification"
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Failed to get info for disk %s"
@@ -1463,31 +1468,31 @@ msgstr "Failed to roll back reservations %(reservations)s"
 msgid "Rolled back reservations %(reservations)s"
 msgstr "Failed to roll back reservations %(reservations)s"
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "Starting %(topic)s node (version %(vcs_string)s)"
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "Creating Consumer connection for Service %s"
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Service killed that has no database entry"
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr "serve() can only be called once"
 
@@ -1503,62 +1508,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, fuzzy, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr "Unknown base file: %s"
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Expected object of type: %s"
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Invalid server_string: %s"
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' took %(total_time).2f secs"
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr "Reloading cached file %s"
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Could not remove tmpdir: %s"
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "Server name is not a string or unicode"
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, fuzzy, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr "Server name must be less than 256 characters."
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1639,11 +1644,11 @@ msgstr "%(code)s: %(message)s"
 msgid "FaultWrapper: %s"
 msgstr "FaultWrapper: %s"
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr "Too many failed authentications."
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1652,114 +1657,114 @@ msgstr ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr "Signature not provided"
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr "Access key not provided"
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr "Failure communicating with keystone"
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Live Migration failure: %(e)s"
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Too many failed authentications."
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "Unauthorized request for controller=%(controller)s and action=%(action)s"
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "SnapshotNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "KeyPairExists raised: %s"
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, fuzzy, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr "InvalidRequest raised: %s"
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "InvalidParameterValue raised: %s"
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "InvalidPortRange raised: %s"
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "NotAuthorized raised: %s"
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "InvalidRequest raised: %s"
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr "QuotaError raised: %s"
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr "Invalid id: bogus (expecting \"i-...\"): %s"
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr "Environment: %s"
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "An unknown error has occurred. Please try your request again."
@@ -1769,224 +1774,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:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Create snapshot of volume %s"
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Could not find key pair(s): %s"
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair %s"
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr "Quota exceeded, too many key pairs."
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr "Import key %s"
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair %s"
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 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:616
+#: nova/api/ec2/cloud.py:627
 #, 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:623
+#: nova/api/ec2/cloud.py:634
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr "No rule for the specified parameters."
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr "%s - This rule already exists in group"
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Create volume from snapshot %s"
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 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:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr "Delete Failed"
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, 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:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr "Attach Failed."
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr "Detach Volume Failed."
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribute not supported: %s"
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "Allocate address"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr "No more floating IPs available"
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "Release address %s"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr "Unable to release IP Address."
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, 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:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Unable to associate IP Address, no fixed_ips."
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr "Floating ip is already associated."
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr "l3driver call to add floating ip failed."
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr "Error, unable to associate floating ip."
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr "Floating ip is not associated."
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: 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:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr "Image must be available"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr "Going to start terminating instances"
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance %r"
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr "Going to stop instances"
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr "Going to start instances"
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image %s"
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr "imageLocation is required"
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, 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:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr "user or group not specified"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "only group \"all\" is supported"
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr "operation_type must be add or remove"
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Updating image %s publicity"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, 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:1622
+#: nova/api/ec2/cloud.py:1641
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
@@ -1995,40 +2000,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:1653
+#: nova/api/ec2/cloud.py:1673
 #, 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:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr "image of %(instance)s at %(now)s"
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Getting list of instances"
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance not present"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Getting list of instances"
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr "Invalid CIDR"
 
@@ -2832,7 +2837,7 @@ msgstr "createBackup attribute 'rotation' must be an integer"
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr "Instance not found"
 
@@ -3159,7 +3164,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Floating ip %(address)s is not associated."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3188,37 +3193,37 @@ msgstr "Invalid mode: '%s'"
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, fuzzy, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr "Putting host %(host)s in maintenance mode %(mode)s."
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 #, fuzzy
 msgid "Virt driver does not implement host maintenance mode."
 msgstr "Virt driver does not implement uptime function."
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Calling setter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Updating host stats"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 #, fuzzy
 msgid "Virt driver does not implement host disabled status."
 msgstr "Virt driver does not implement uptime function."
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 #, fuzzy
 msgid "Virt driver does not implement host power management."
 msgstr "Virt driver does not implement uptime function."
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource is admin only functionality"
 
@@ -3358,19 +3363,36 @@ msgstr "Quota exceeded, too many key pairs."
 msgid "Create networks failed"
 msgstr "Create failed"
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr "Quota limit must be -1 or greater."
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
-#, fuzzy, python-format
-msgid "Quota for %s should be integer."
-msgstr "version should be an integer"
+#: nova/api/openstack/compute/contrib/quotas.py:152
+#, python-format
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
+msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
 msgid "Malformed scheduler_hints attribute"
@@ -3409,25 +3431,32 @@ msgstr "Security group not specified"
 msgid "Security group name cannot be empty"
 msgstr "Security group name cannot be empty"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr "start instance"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr "stop instance"
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "Unknown chain: %r"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:189
 #, fuzzy
 msgid "Unknown service"
 msgstr "unknown guestmount error"
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3664,30 +3693,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
-msgstr "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr "Template for cloudpipe instance boot script"
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr "Network to push into openvpn config"
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr "Netmask to push into openvpn config"
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Launching VPN for %s"
@@ -3697,35 +3726,35 @@ msgstr "Launching VPN for %s"
 msgid "Failed to load %s"
 msgstr "Failed to create VM %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "element is not a child"
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3748,326 +3777,326 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "received %s"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "DB error: %s"
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "network"
 msgstr "Reset network"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 #, fuzzy
 msgid "IP address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Zero fixed ips could be found."
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "No fixed ips associated to instance"
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "Floating ip %(address)s already exists."
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "project"
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 #, fuzzy
 msgid "No networks found"
 msgstr "Network not found"
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s is required to create a network."
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "stop instance"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Service %(service_id)s could not be found."
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Service %(service_id)s could not be found."
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Unexpected error: %s"
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 #, fuzzy
 msgid "PROJECT"
 msgstr "project"
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 #, fuzzy
 msgid "Must supply valid parameters to create instance_type"
 msgstr "Unable to create instance type"
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instance not present"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 #, fuzzy
 msgid "Unknown error"
 msgstr "unknown guestmount error"
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, fuzzy, python-format
 msgid "%s created"
 msgstr "Table |%s| not created!"
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 #, fuzzy
 msgid "Valid instance type name is required"
 msgstr "%s is a valid instance name"
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "DB error: %s"
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, fuzzy, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr "%(key)s with value %(value)s failed validator %(name)s"
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "hyperv vm state: %s"
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4124,55 +4153,55 @@ msgstr "Metadata property value greater than 255 characters"
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach boot volume to instance %s"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, 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:1257
+#: nova/compute/api.py:1258
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, 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:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to soft delete instance"
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate instance"
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr "Going to try to stop instance"
 
@@ -4180,21 +4209,21 @@ msgstr "Going to try to stop instance"
 msgid "Going to try to start instance"
 msgstr "Going to try to start instance"
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr "Searching by: %s"
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr "snapshot for %s"
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id is None. Assuming migration."
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4203,63 +4232,63 @@ msgstr ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, 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:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr "Locking"
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr "Unlocking"
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr "Volume must be attached in order to detach."
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, 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:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr "Keypair name contains unsafe characters"
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, 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:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Security group %s cannot be empty."
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4268,68 +4297,68 @@ msgstr ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, 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:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr "Quota exceeded, too many security groups."
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Security group %s already exists"
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Unable to destroy vbd %s"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy vbd %s"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr "Security group is still in use"
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr "Failed to update usages deallocating security group"
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Rule (%s) not found"
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr "Quota exceeded, too many security group rules."
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress %s"
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr "Security group id should be integer"
 
@@ -4392,295 +4421,290 @@ msgstr ""
 "Unable to claim resources.  Free CPU %(free_vcpus)d < requested CPU "
 "%(vcpus)d"
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr "names can only contain [a-zA-Z0-9_.- ]"
 
-#: nova/compute/flavors.py:99
+#: 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"
 
-#: nova/compute/flavors.py:108
+#: 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"
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 #, fuzzy
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr "create arguments must be positive integers"
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "Instance type %s not found for deletion"
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr "Possibly task preempted."
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 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:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Failed to terminate instance"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, 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:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Rebooting instance after nova-compute restart."
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Hypervisor driver does not support resume guests"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Failed to suspend instance"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Hypervisor driver does not support firewall rules"
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Unexpected status code"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr "Checking state"
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Setting up bdm %s"
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
-#, fuzzy, python-format
-msgid "No node specified, defaulting to %(node)s"
-msgstr "Memory limit not specified, defaulting to unlimited"
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
+#, python-format
+msgid "No node specified, defaulting to %s"
+msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Instance failed to spawn"
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr "Error trying to reschedule"
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr "Retry info not present, will not reschedule"
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr "No request spec, will not reschedule"
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, fuzzy, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr "Re-scheduling instance: attempt %d"
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr "Instance build timed out. Set to error state."
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr "Starting instance..."
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Floating ip pool not found."
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr "Instance failed network setup"
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Instance network_info: |%s|"
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr "Instance failed block device setup"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr "Instance failed to spawn"
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr "Deallocating network for instance"
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s instance"
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignoring DiskNotFound: %s"
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignoring VolumeNotFound: %s"
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr "terminating bdm %s"
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr "Ignoring volume cleanup failure due to %s"
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Setting instance vm_state to ERROR"
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr "Rebuilding instance"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, 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:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Attach boot from volume failed: %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr "Rebooting instance"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4689,21 +4713,21 @@ msgstr ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: rebooted"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr "instance snapshotting"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4712,163 +4736,161 @@ msgstr ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Found %(num_images)d images (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Rotating out %d backups"
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr "Deleting image %s"
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, 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:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr "Root password set"
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 #, 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:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password failed: %s"
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr "error setting admin password"
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
-msgstr "injecting file to %(path)s"
+msgid "injecting file to %s"
+msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr "Rescuing"
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Error trying to reschedule"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr "Unrescuing"
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
-msgstr "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
+msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Setting instance to %(state)s state."
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instance has no volume."
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr "destination same as source!"
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr "Migrating"
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
-msgstr "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
+msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr "Pausing"
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr "Unpausing"
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr "Retrieving diagnostics"
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr "Resuming"
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr "Reset network"
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr "Inject network info"
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info to inject: |%s|"
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr "Get console output"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr "Getting vnc console"
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Getting vnc console"
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, 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:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "Attaching volume %(volume_id)s to %(mountpoint)s"
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
@@ -4877,59 +4899,59 @@ msgstr ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, 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:3063
+#: nova/compute/manager.py:3093
 #, 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:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, 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:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "allocate_for_instance() for %s"
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "Port %(port_id)s is still in use."
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "Host %(host)s could not be found."
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
-msgstr "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
+msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr "_post_live_migration() is started.."
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
-msgstr "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
+msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4937,20 +4959,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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr "Post operation of migration started"
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Failed to get info for disk %s"
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr "Updated the info_cache for instance"
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -4959,12 +4981,12 @@ msgstr ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, 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:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
@@ -4973,26 +4995,26 @@ msgstr ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr "In ERROR state"
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, 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:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
-msgstr "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
+msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
@@ -5001,25 +5023,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:3715
+#: nova/compute/manager.py:3750
 #, 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:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr "Updating bandwidth usage cache"
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Updating bandwidth usage cache"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr "Updating host status"
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5028,11 +5050,11 @@ msgstr ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 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:3927
+#: nova/compute/manager.py:3961
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
@@ -5041,80 +5063,76 @@ msgstr ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 
-#: nova/compute/manager.py:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr "Instance shutdown by itself. Calling the stop API."
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr "error during stop() in sync_power_state."
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 #, 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:3997
+#: nova/compute/manager.py:4030
 #, fuzzy
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr "Instance is paused or suspended unexpectedly. Calling the stop API."
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr "Instance is not stopped. Calling the stop API."
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance is not (soft-)deleted."
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, skipping..."
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr "Reclaiming deleted instance"
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Loading compute driver '%s'"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 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:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
 
-#: nova/compute/manager.py:4137
-#, fuzzy, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
-msgstr "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
+#: nova/compute/manager.py:4169
+#, python-format
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
+msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Setting instance to %(state)s state."
@@ -5224,11 +5242,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr "Missing keys: %s"
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr "No compute host specified"
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "Unable to find host for Instance %s"
@@ -5238,7 +5256,7 @@ msgstr "Unable to find host for Instance %s"
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr "Using %(prefix)s instead of %(req_prefix)s"
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5335,11 +5353,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Failed to reboot instance"
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Failed to reboot instance"
@@ -5358,44 +5376,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Unrecognized read_deleted value '%s'"
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr "Change will make usage less than 0 for the following resources: %(unders)s"
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5412,57 +5430,57 @@ msgstr "version should be an integer"
 msgid "Upgrade DB using Essex release first."
 msgstr "Upgrade DB using Essex release first."
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 #, fuzzy
 msgid "Unsupported id columns type"
 msgstr "Unsupported Content-Type"
@@ -5490,7 +5508,7 @@ msgstr ""
 "Error contacting glance server '%(host)s:%(port)s' for '%(method)s', "
 "%(extra)s."
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, fuzzy, python-format
 msgid "fetching image %s from glance"
 msgstr "Fetching image '%s' from glance"
@@ -5669,23 +5687,23 @@ msgstr "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr "This driver only supports type 'a' entries."
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5712,109 +5730,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr "IPTablesManager.apply completed with success"
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr "arping error for ip %s"
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d is stale, skip killing dnsmasq"
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq threw %s"
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "killing radvd threw %s"
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Invalid mode: '%s'"
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Starting VLAN interface %s"
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Starting bridge %s "
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr "Failed to add interface: %s"
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr "Starting bridge %s "
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr "Done starting bridge %s"
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "Disassociated %s stale fixed ip(s)"
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr "setting network host"
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr "network allocations"
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, fuzzy, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr "networks retrieved for instance: |%(networks)s|"
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr "network deallocation for instance"
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5825,61 +5843,61 @@ msgstr ""
 "|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
 "created."
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, fuzzy, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr "Quota exceeded for %(pid)s, tried to allocate floating IP"
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 #, fuzzy
 msgid "Failed to update usages deallocating fixed IP"
 msgstr "Failed to update usages deallocating floating IP"
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr "Unable to release %s because vif doesn't exist."
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Leased IP |%(address)s|"
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "IP %s leased that is not associated"
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "IP |%s| leased that isn't allocated"
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Released IP |%(address)s|"
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "IP %s released that is not associated"
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s released that was not leased"
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr "%s must be an integer"
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr "Maximum allowed length for 'label' is 255."
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
@@ -5888,16 +5906,16 @@ msgstr ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr "cidr already in use"
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -5906,16 +5924,16 @@ msgstr ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr "Network already exists!"
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Network must be disassociated from project %s before delete"
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -5923,7 +5941,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -6056,7 +6074,7 @@ 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:262
+#: nova/network/security_group/quantum_driver.py:263
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Caught error: %s"
@@ -6071,46 +6089,46 @@ msgstr "Delete security group %s"
 msgid "Security group id should be uuid"
 msgstr "Security group id should be integer"
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, 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:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, 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:446
+#: nova/network/security_group/quantum_driver.py:444
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6134,12 +6152,12 @@ msgstr "error setting admin password"
 msgid "Invalid version string"
 msgstr "Invalid server_string: %s"
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6853,7 +6871,7 @@ msgstr "Could not find another compute"
 msgid "Exception during scheduler.run_instance"
 msgstr "Exception during scheduler.run_instance"
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr "Setting instance to %(state)s state."
@@ -6978,7 +6996,7 @@ msgstr "No service for compute ID %s"
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "Failed to schedule_%(method)s: %(ex)s"
@@ -7017,7 +7035,7 @@ msgstr "%(host_state)s fails instance_type extra_specs requirements"
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr "%(host_state)s fails instance_type extra_specs requirements"
@@ -7289,7 +7307,7 @@ msgstr "200 No Roles"
 msgid "unexpected role header"
 msgstr "unexpected role header"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
@@ -7298,53 +7316,53 @@ msgstr ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 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:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "After terminating instances: %s"
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr "Internal error"
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "After force-killing instances: %s"
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 #, fuzzy
 msgid "spawn error"
 msgstr "unknown guestmount error"
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7353,12 +7371,12 @@ msgstr ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, fuzzy, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr "Result: %(result)s is not a dict."
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7368,22 +7386,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, fuzzy, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr "Result: %(result)s is not a list."
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, fuzzy, python-format
 msgid ""
 "Values do not match:\n"
@@ -7456,36 +7474,36 @@ msgstr "Decoding JSON: %s"
 msgid "fake vswitch not found"
 msgstr "marker [%s] not found"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr "Please extend mock libvirt module to support flags"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr "Expected a list for 'auth' parameter"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr "Expected a function in 'auth[0]' parameter"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr "Expected a function in 'auth[1]' parameter"
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, 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:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Removing simulated guest agent files in %s"
@@ -7495,25 +7513,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:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr "Compute driver option required, but not specified"
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr "Loading compute driver '%s'"
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Unable to load the virtualization driver: %s"
@@ -7523,24 +7541,24 @@ msgstr "Unable to load the virtualization driver: %s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "Attempted to unfilter instance which is not filtered"
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr "Filters added to instance"
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr "Provider Firewall Rules refreshed"
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr "Adding security group rule: %r"
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr "Adding provider rule: %s"
@@ -8325,17 +8343,17 @@ 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:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "Updating host stats"
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 #, fuzzy
 msgid "get_host_stats called"
 msgstr "get_console_output called"
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, fuzzy, python-format
 msgid "Host IP address is: %s"
 msgstr "Release address %s"
@@ -8692,12 +8710,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Using config drive"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, 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:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Creating config drive at %(path)s"
@@ -8856,7 +8874,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr "Could not determine iscsi initiator name"
 
@@ -8875,230 +8893,240 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr "An error has occurred when calling the iscsi initiator: %s"
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, fuzzy, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr "Unable to find vbd for vdi %s"
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, 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:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "Volume %s does not exist in Nexenta SA"
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, 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:642
+#: nova/virt/libvirt/driver.py:672
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, 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:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr "During wait destroy, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr "Instance destroyed successfully."
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Going to stop instances"
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr "Error from libvirt during undefineFlags. Retrying with undefine"
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, 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:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, 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:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "Deleting instance files %(target)s"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, 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:915
+#: nova/virt/libvirt/driver.py:944
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "Could not determine iscsi initiator name"
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "Could not determine iscsi initiator name"
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr "During detach_volume, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "No networks defined."
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "During detach_volume, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "No networks defined."
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr "Instance soft rebooted successfully."
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr "Failed to soft reboot instance."
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr "Instance shutdown successfully."
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr "Instance rebooted successfully."
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr "Instance is running"
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "Instance spawned successfully."
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 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:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr "Path '%(path)s' supports direct I/O"
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, 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:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, 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:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr "Creating image"
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr "Using config drive"
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, 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:1930
+#: nova/virt/libvirt/driver.py:1959
 #, 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:1987
+#: nova/virt/libvirt/driver.py:2018
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
@@ -9107,20 +9135,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:1993
+#: nova/virt/libvirt/driver.py:2024
 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:1997
+#: nova/virt/libvirt/driver.py:2028
 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:2001
+#: nova/virt/libvirt/driver.py:2032
 #, 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:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
@@ -9128,7 +9156,7 @@ msgstr ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9136,12 +9164,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9150,27 +9185,32 @@ msgstr ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, fuzzy, python-format
 msgid "Invalid exclusion expression %r"
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, fuzzy, python-format
 msgid "Invalid inclusion expression %r"
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9179,35 +9219,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:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 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:2812
+#: nova/virt/libvirt/driver.py:2863
 #, 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:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9215,21 +9245,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9238,15 +9268,15 @@ msgstr ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 
-#: nova/virt/libvirt/driver.py:3006
+#: nova/virt/libvirt/driver.py:3057
 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:3014
+#: nova/virt/libvirt/driver.py:3065
 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:3059
+#: nova/virt/libvirt/driver.py:3110
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9255,7 +9285,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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9264,7 +9294,7 @@ msgstr ""
 "Instance launched has CPU info:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9279,7 +9309,7 @@ msgstr ""
 "\n"
 "Refer to %(u)s"
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9288,22 +9318,22 @@ msgstr ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 
-#: nova/virt/libvirt/driver.py:3161
+#: nova/virt/libvirt/driver.py:3214
 #, 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:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Live Migration failure: %(e)s"
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, 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:3447
+#: nova/virt/libvirt/driver.py:3500
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9312,38 +9342,38 @@ msgstr ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "skipping %(path)s since it looks like volume"
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, 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:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr "Starting migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr "Instance running successfully."
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr "Starting finish_migration"
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr "Starting finish_revert_migration"
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, fuzzy, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr "Deleting instance files %(target)s"
@@ -9356,25 +9386,25 @@ msgstr ""
 "Libvirt module could not be loaded. NWFilterFirewall will not work "
 "correctly."
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr "Called setup_basic_filtering in nwfilter"
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr "Ensuring static filters"
 
-#: nova/virt/libvirt/firewall.py:247
+#: 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."
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, 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:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables firewall: Setup Basic Filtering"
 
@@ -9572,7 +9602,7 @@ msgstr "Path %s must be LVM logical volume"
 msgid "Path %s must be LVM logical volume"
 msgstr "Path %s must be LVM logical volume"
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr "Can't retrieve root device path from instance libvirt configuration"
 
@@ -9609,14 +9639,14 @@ msgstr "Ensuring bridge %s"
 msgid "Failed while unplugging vif"
 msgstr "Failed while unplugging vif"
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9624,7 +9654,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9632,7 +9662,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9640,7 +9670,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9648,12 +9678,12 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "iSCSI device not found at %s"
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, fuzzy, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
@@ -9662,48 +9692,48 @@ msgstr ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, fuzzy, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr "%s is already mounted"
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "iSCSI device not found at %s"
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, fuzzy, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, fuzzy, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 #, fuzzy
 msgid "Fibre Channel device not found."
 msgstr "iSCSI device not found at %s"
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, fuzzy, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
@@ -9712,30 +9742,30 @@ msgstr ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, fuzzy, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9841,26 +9871,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr "File transfer to PowerVM manager failed"
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, fuzzy, python-format
 msgid "Attempting to resolve %s"
 msgstr "Attempting to bind NIC to %s "
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -10013,32 +10043,32 @@ msgstr ""
 "Must specify vmwareapi_host_ip,vmwareapi_host_username and "
 "vmwareapi_host_password to usecompute_driver=vmwareapi.VMWareESXDriver"
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "marker [%s] not found"
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, 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:540
+#: nova/virt/vmwareapi/driver.py:534
 #, 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:576
+#: nova/virt/vmwareapi/driver.py:570
 #, 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:581
+#: nova/virt/vmwareapi/driver.py:575
 #, 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:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "In vmwareapi:_poll_task, Got this error %s"
@@ -10048,39 +10078,39 @@ msgstr "In vmwareapi:_poll_task, Got this error %s"
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr "Error(s) %s occurred in the call to RetrieveProperties"
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, 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:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr "There is no VM registered"
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, 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:557
+#: nova/virt/vmwareapi/fake.py:559
 #, 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:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr "Session is faulty"
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr "Session Invalid"
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " No Virtual Machine has been registered yet"
@@ -10090,17 +10120,17 @@ msgstr " No Virtual Machine has been registered yet"
 msgid "%(action)s %(host)s"
 msgstr "action: %s"
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, fuzzy, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr "Setting host %(host)s to %(state)s."
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr "Glance image %s is in killed state"
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr "Glance image %(image_id)s is in unknown state - %(state)s"
@@ -10123,7 +10153,7 @@ msgstr "Creating Port Group with name %s on the ESX host"
 msgid "Created Port Group with name %s on the ESX host"
 msgstr "Created Port Group with name %s on the ESX host"
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, fuzzy, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr "Exception during HTTP connection close in VMWareHTTpWrite. Exception is %s"
@@ -10166,17 +10196,17 @@ msgstr "Getting list of instances"
 msgid "Got total of %s instances"
 msgstr "Got total of %s instances"
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 #, fuzzy
 msgid "Creating VM on the ESX host"
 msgstr "Creating VM on the ESX  host"
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 #, fuzzy
 msgid "Created VM on the ESX host"
 msgstr "Created VM on the ESX  host"
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, fuzzy, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
@@ -10185,7 +10215,7 @@ msgstr ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, fuzzy, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
@@ -10194,7 +10224,7 @@ msgstr ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, fuzzy, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
@@ -10203,7 +10233,7 @@ msgstr ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, fuzzy, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
@@ -10212,7 +10242,7 @@ msgstr ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
@@ -10221,7 +10251,7 @@ msgstr ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, fuzzy, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
@@ -10230,7 +10260,7 @@ msgstr ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, fuzzy, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -10240,7 +10270,7 @@ msgstr ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, fuzzy, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
@@ -10249,109 +10279,104 @@ msgstr ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr "Powering on the VM instance"
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr "Powered on the VM instance"
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr "Creating Snapshot of the VM instance"
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr "Created Snapshot of the VM instance"
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr "Copying disk data before snapshot of the VM"
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr "Copied disk data before snapshot of the VM"
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr "Uploading image %s"
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr "Uploaded image %s"
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr "Deleting temporary vmdk file %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr "Deleted temporary vmdk file %s"
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr "instance is not powered on"
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr "Rebooting guest OS of VM"
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr "Rebooted guest OS of VM"
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr "Doing hard reboot of VM"
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr "Did hard reboot of VM"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr "instance not present"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Destroying VM"
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "VM destroyed"
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, fuzzy, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr "Powering off the VM"
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr "Powered off the VM"
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr "Unregistering the VM"
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr "Unregistered the VM"
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
@@ -10360,17 +10385,17 @@ msgstr ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr "Deleting contents of the VM from datastore %(datastore_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr "Deleted contents of the VM from datastore %(datastore_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
@@ -10379,94 +10404,98 @@ msgstr ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr "pause not supported for vmwareapi"
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr "unpause not supported for vmwareapi"
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr "Suspending the VM"
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr "Suspended the VM"
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 #, fuzzy
 msgid "instance is powered off and cannot be suspended."
 msgstr "instance is powered off and can not be suspended."
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr "VM was already in suspended state. So returning without doing anything"
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr "Resuming the VM"
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr "Resumed the VM"
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr "instance is not in a suspended state"
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 #, fuzzy
 msgid "instance is suspended and cannot be powered off."
 msgstr "instance is not powered on"
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 #, fuzzy
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr "VM was already in suspended state. So returning without doing anything"
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 #, fuzzy
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr "VM was already in suspended state. So returning without doing anything"
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 #, fuzzy
 msgid "Powering on the VM"
 msgstr "Powering off the VM"
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 #, fuzzy
 msgid "Powered on the VM"
 msgstr "Powered off the VM"
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Updating progress to %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Creating volume: %s"
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr "instance not present"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, fuzzy, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
@@ -10475,96 +10504,96 @@ msgstr ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Creating volume: %s"
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Create volume from snapshot %s"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "Automatically hard rebooting"
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr "get_diagnostics not implemented for vmwareapi"
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 #, fuzzy
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr "Reconfiguring VM instance to attach the image disk"
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 #, fuzzy
 msgid "Reconfigured VM instance to set the machine id"
 msgstr "Reconfigured VM instance to attach the image disk"
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, 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:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, 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:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "Creating directory with path %s"
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr "Created directory with path %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr "Downloading image %s from glance image server"
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr "Downloaded image %s from glance image server"
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr "Uploading image %s to the Glance image server"
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr "Uploaded image %s to the Glance image server"
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr "Getting image size for the image %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "Got image size of %(size)s for the image %(image)s"
@@ -10627,7 +10656,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
@@ -10637,12 +10666,12 @@ msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find iSCSI Target"
 msgstr "Unable to find address %r"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
@@ -10652,17 +10681,17 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "Failed to find volume in db"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10671,81 +10700,74 @@ msgstr ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
-msgstr "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr "Querying agent version"
 
-#: nova/virt/xenapi/agent.py:163
+#: 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:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr "Updating agent to %s"
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
-msgstr "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr "Setting admin password"
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
-msgstr "Failed to exchange keys: %(resp)r"
-
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr "Failed to update password: %(resp)r"
+msgid "Failed to exchange keys: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr "Injecting file path: %r"
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
-msgstr "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr "Resetting network"
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
-msgstr "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
@@ -10753,7 +10775,7 @@ msgstr ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
@@ -10761,15 +10783,15 @@ msgstr ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr "XenServer tools are not installed in this image"
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
@@ -10788,54 +10810,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr "Failure while cleaning up attached VDIs"
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr "Could not determine key: %s"
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr "Host startup on XenServer is not supported."
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 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:662
+#: nova/virt/xenapi/driver.py:672
 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:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, 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:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
-msgstr "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr "Calling setter %s"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10844,7 +10866,7 @@ msgstr ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
@@ -10853,14 +10875,14 @@ msgstr ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, fuzzy, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr "Compute host %(host)s could not be found."
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10892,7 +10914,7 @@ msgstr "Found non-unique network for bridge %s"
 msgid "Found no network for bridge %s"
 msgstr "Found no network for bridge %s"
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10903,38 +10925,38 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
-msgstr "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
-msgstr "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
-msgstr "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
-msgstr "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
-msgstr "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
-msgstr "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
+msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
 #, python-format
@@ -10944,11 +10966,9 @@ msgstr "Found no PIF for device %s"
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
-"Expected %(vlan_num)d"
 
 #: nova/virt/xenapi/vm_utils.py:275
 msgid "Created VM"
@@ -10987,37 +11007,37 @@ msgstr "VBD %s already detached"
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr "Reached maximum number of retries trying to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "Unable to destroy VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -11026,54 +11046,66 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr "SR not present and could not be introduced"
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr "block device info: %s"
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
-msgstr "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr "Starting snapshot for VM"
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr "Destroying cached VDI '%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
-"Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr "Unrecognized cache_images value '%s', defaulting to True"
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
@@ -11082,44 +11114,44 @@ msgstr ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr "download_vhd failed: %r"
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr "Invalid value '%s' for xenapi_torrent_images"
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
-msgstr "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, fuzzy, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Fetching image %(image_id)s, type %(image_type_str)s"
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Size for image %(image_id)s: %(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -11128,63 +11160,63 @@ msgstr ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr "Failed to fetch glance image"
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "Detected %(image_type_str)s format for image %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
-msgstr "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
-msgstr "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "Flag sr_matching_filter '%s' does not respect formatting convention"
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
@@ -11194,50 +11226,50 @@ msgstr ""
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr "Cannot find SR of content-type ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
-msgstr "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr "ISO: not iso content"
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO: iso content_type, no 'i18n-key' key"
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: SR MATCHing our criteria"
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, looking to see if it is host local"
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
-msgstr "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR with local PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
@@ -11246,22 +11278,22 @@ msgstr ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
-msgstr "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "Invalid statistics data from Xenserver: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -11270,66 +11302,66 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
-msgstr "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Timeout waiting for device %s to be created"
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr "Disconnecting stale VDI %s from compute domU"
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11337,16 +11369,16 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr "Partitions:"
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -11355,19 +11387,19 @@ msgstr ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
@@ -11376,7 +11408,7 @@ msgstr ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
@@ -11385,63 +11417,63 @@ msgstr ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr "Manipulating interface files directly"
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "Failed to mount filesystem (expected for non-linux instances): %s"
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr "This domU must be running on the host specified by xenapi_connection_url"
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
-msgstr "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, fuzzy, python-format
 msgid "Importing image upload handler: %s"
 msgstr "Writing image info file: %s"
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr "Starting instance"
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "Removing kernel/ramdisk files from dom0"
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr "Block device information present: %s"
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr "Failed to spawn, rolling back"
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr "Auto configuring disk, attempting to resize partition..."
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr "Starting VM"
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr "Waiting for instance state to become running"
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
@@ -11450,62 +11482,57 @@ msgstr ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "Instance agent version: %s"
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr "Setting VCPU weight"
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr "Could not find VM with name %s"
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr "Finished snapshot and upload for VM"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr "Failed to transfer vhd to new host"
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "Failed to terminate instance"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
@@ -11514,121 +11541,117 @@ msgstr "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgid "Resize complete"
 msgstr "Resize complete"
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr "Starting halted instance found during reboot"
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "Unable to find root VBD/VDI for VM"
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "Destroying VM"
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr "Using RAW or VHD, skipping kernel and ramdisk deletion"
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "instance has a kernel or ramdisk but not both"
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr "kernel/ramdisk files removed"
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr "Destroying VM"
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr "VM is not present, skipping destroy..."
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "Instance is already in Rescue Mode: %s"
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 #, fuzzy
 msgid "VM is not present, skipping soft delete..."
 msgstr "VM is not present, skipping destroy..."
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr "Automatically hard rebooting"
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr "Injecting network info to xenstore"
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr "Creating vifs"
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
-msgstr "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Created VIF %(vif_ref)s, network %(network_ref)s"
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr "Injecting hostname to xenstore"
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "Bad networks format"
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr "Migrate Receive failed"
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 #, fuzzy
 msgid "VM.assert_can_migrate failed"
 msgstr "VM.assert_can_migratefailed"
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr "Migrate Send failed"
 
 #: nova/virt/xenapi/volume_utils.py:51
-#, fuzzy, python-format
-msgid "Creating SR %(label)s"
-msgstr "Creating SR %s"
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
-#, fuzzy, python-format
-msgid "Introducing SR %(label)s"
-msgstr "Introducing SR %s"
+#, python-format
+msgid "Introducing SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
 #, fuzzy
@@ -11678,25 +11701,25 @@ msgstr "Unable to introduce VDI for SR %s"
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
-msgstr "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
+msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
-msgstr "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "Detach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
-#, fuzzy, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
-msgstr "LPAR instance '%(instance_name)s' could not be found"
+#: nova/virt/xenapi/volumeops.py:143
+#, python-format
+msgid "Skipping detach because VBD for %s was not found"
+msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
 #, python-format
@@ -11706,7 +11729,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, fuzzy, python-format
 msgid "upload_vhd failed: %r"
 msgstr "download_vhd failed: %r"
@@ -11761,8 +11784,237 @@ msgstr "status must be available"
 msgid "status must be 'available'"
 msgstr "status must be available"
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr "version should be an integer"
+
+#~ msgid "Unknown action"
+#~ msgstr "Unknown chain: %r"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr "Instance type for vpn instances"
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr "Memory limit not specified, defaulting to unlimited"
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "Cannot reboot instance: %(exc)s"
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr "injecting file to %(path)s"
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr "Changing instance metadata according to %(diff)r"
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "Port %(port_id)s is still in use."
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "Host %(host)s could not be found."
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr "Pre live migration failed at  %(dest)s"
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr "Migrating instance to %(dest)s finished successfully."
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr "Instance %(instance_uuid)s not found"
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr "Error auto-confirming resize: %(e)s. Will retry later."
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "FLAGS.running_deleted_instance_action"
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
 #~ msgstr ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr "Failed to query agent version: %(resp)r"
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr "Failed to update agent: %(resp)r"
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr "Failed to exchange keys: %(resp)r"
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr "Failed to update password: %(resp)r"
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr "Failed to inject file: %(resp)r"
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr "Failed to reset network: %(resp)r"
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr "Calling %(localname)s %(impl)s"
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr "Unable to eject %(host)s from the pool; pool not empty"
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr "Unable to eject %(host)s from the pool; No master found"
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr "Pool-Join failed: %(e)s"
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr "Unable to join %(host)s in the pool"
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr "Pool-eject failed: %(e)s"
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "Unable to set up pool: %(e)s."
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr "Pool-set_name_label failed: %(e)s"
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr "No primary VDI found for %(vm_ref)s"
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr "Asking xapi to fetch vhd image %(image_id)s"
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr "Unknown image format %(disk_image_type)s"
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr "Unable to parse rrd of %(vm_uuid)s"
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr "ISO: looking at SR %(sr_rec)s"
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr "ISO: PBD %(pbd_ref)s disappeared"
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr "Unable to obtain RRD XML updates with server details: %(server)s."
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr "Updating progress to %(progress)d"
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr "Creating VIF for network %(network_ref)s"
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr "Creating SR %s"
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr "Introducing SR %s"
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr "Unable to obtain target information %(mountpoint)s"
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr "Unable to obtain target information %(connection_data)s"
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "Detach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
+#~ msgstr "LPAR instance '%(instance_name)s' could not be found"
 
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index d0d14a442..13cb6f2e0 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -184,7 +184,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1034,337 +1034,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, 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:1086
+#: nova/exception.py:1090
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, 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:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, 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:1106
+#: nova/exception.py:1110
 #, 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:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, 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:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, 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:1209
+#: nova/exception.py:1213
 #, 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:1214
+#: nova/exception.py:1218
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1387,7 +1392,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Fallo al generar metadatos para la ip %s"
@@ -1425,31 +1430,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Se detuvo un servicio sin entrada en la base de datos"
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1463,62 +1468,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr "Depuración de la devolución de llamada: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "No se encuentra la dirección del enlace local.:%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "No se pudo obtener enlace de la ip local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "backend inválido: %s"
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1599,125 +1604,125 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr "Demasiados intentos de autenticacion fallidos."
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Fallo de autenticación: %s"
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Demasiados intentos de autenticacion fallidos."
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr "acción: %s"
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "No encontrado: %s"
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Ha sucedido un error desconocido. Por favor repite el intento de nuevo."
@@ -1727,265 +1732,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:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr "Creando par de claves %s"
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Borrar para de claves %s"
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Protocolo IP invalido %(protocol)s"
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr "No hay regla para los parámetros especificados."
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, 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:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 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:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Desasociar volumen %s"
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo no soportado: %s"
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "Asignar dirección"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar dirección %s"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instancia %r"
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr "usuario o grupo no especificado"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "sólo el grupo \"all\" está soportado"
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr "operation_type debe ser añadir o eliminar"
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Actualizando imagen %s públicamente"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instancia %s: rescatada"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Cidr %(cidr)s invalido"
@@ -2784,7 +2789,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3105,7 +3110,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3134,34 +3139,34 @@ msgstr "backend inválido: %s"
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Llanado al adquiridor %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Llanado al adquiridor %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3299,18 +3304,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr "configurando la red del host"
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
+#, python-format
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
 #, python-format
-msgid "Quota for %s should be integer."
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3349,26 +3371,33 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 #, fuzzy
 msgid "start instance"
 msgstr "Reiniciar instancia %r"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 #, fuzzy
 msgid "stop instance"
 msgstr "Reiniciar instancia %r"
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "acción: %s"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3605,31 +3634,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-#, fuzzy
-msgid "Instance type for vpn instances"
-msgstr "Tipo de instancia inválido %(instance_type)s."
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr "Red a insertar en la configuración de openvpn"
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr "Mascara de red a insertar en la configuración de openvpn"
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Lanzando VPN para %s"
@@ -3639,35 +3667,35 @@ msgstr "Lanzando VPN para %s"
 msgid "Failed to load %s"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3688,320 +3716,320 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "recibido %s"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "network"
 msgstr "configurando la red del host"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 #, fuzzy
 msgid "IP address"
 msgstr "Asignar dirección"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "el grupo %s ya existe"
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 #, fuzzy
 msgid "No networks found"
 msgstr "configurando la red del host"
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "Reiniciar instancia %r"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instancia %s: rescatada"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "Capturado error: %s"
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4059,57 +4087,57 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Imposible adjuntar volumen a la instancia %s"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, 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:1257
+#: nova/compute/api.py:1258
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Vamos a ejecutar %s insntacias..."
@@ -4119,153 +4147,153 @@ msgstr "Vamos a ejecutar %s insntacias..."
 msgid "Going to try to start instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, 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:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Crear Grupo de Seguridad %s"
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4324,64 +4352,52 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4390,644 +4406,651 @@ msgstr ""
 "Incapaz de emigrar la instancia %(instance_id)s al actual anfitrion "
 "(%(host)s)"
 
-#: nova/compute/manager.py:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Fallo a reinicia la instancia"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "Ejecutando instancias: %s"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instancia %s: reiniciada"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Tipo de instancia inválido %(instance_type)s."
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instancia %s: obteniendo los diagnosticos"
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 #, fuzzy
 msgid "Reset network"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 #, fuzzy
 msgid "Inject network info"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 #, fuzzy
 msgid "Get console output"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, 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:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desvinculando volumen de instancia desconocida %s"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, 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:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "instancia %s: arrancada"
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "La instacia %(instance_id)s no esta suspendida"
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "La instacia %(instance_id)s no esta suspendida"
+#: nova/compute/manager.py:3691
+#, python-format
+msgid "Instance %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Borrando usuario %s"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instancia %s: arrancada"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Borrando usuario %s"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
@@ -5127,11 +5150,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5141,7 +5164,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5237,11 +5260,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Fallo a reinicia la instancia"
@@ -5260,44 +5283,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5314,57 +5337,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5388,7 +5411,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5559,23 +5582,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5600,109 +5623,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "El pid %d está pasado, relanzando dnsmasq"
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Excepción al recargar la configuración de dnsmasq: %s"
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "El pid %d está pasado, relanzando dnsmasq"
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "Matando radvd lanzado %s"
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d corrupto, relanzando radvd"
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "backend inválido: %s"
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Iniciando interfaz VLAN %s"
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr "configurando la red del host"
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5710,98 +5733,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5931,7 +5954,7 @@ 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:262
+#: nova/network/security_group/quantum_driver.py:263
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Capturado error: %s"
@@ -5946,46 +5969,46 @@ msgstr "Borrar grupo de seguridad %s"
 msgid "Security group id should be uuid"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Capturado error: %s"
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, 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:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6006,12 +6029,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6717,7 +6740,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: 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."
@@ -6837,7 +6860,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6876,7 +6899,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7133,71 +7156,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr "Ejecutando instancias: %s"
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Después de terminar las instancias: %s"
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7207,22 +7230,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7289,36 +7312,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr "configurando la red del host"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7328,25 +7351,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7355,25 +7378,25 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 #, fuzzy
 msgid "Filters added to instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8149,17 +8172,17 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 #, fuzzy
 msgid "get_host_stats called"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, fuzzy, python-format
 msgid "Host IP address is: %s"
 msgstr "Liberar dirección %s"
@@ -8505,12 +8528,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:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8676,7 +8699,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8695,254 +8718,264 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "el grupo de volumenes %s no existe"
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr "Conexión a libvirt rota"
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instancia %s: reiniciada"
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 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:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, 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:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8950,73 +8983,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, 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:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9024,50 +9059,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9077,67 +9112,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Fallo de autenticación: %s"
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9148,25 +9183,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9353,7 +9388,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9390,14 +9425,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9405,7 +9440,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9413,7 +9448,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9421,7 +9456,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9429,87 +9464,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "el grupo %s ya existe"
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9616,26 +9651,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr "Falló la conexión a melange"
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9782,32 +9817,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9817,39 +9852,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9858,17 +9893,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr "acción: %s"
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9889,7 +9924,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9932,57 +9967,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9990,317 +10025,316 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 #, fuzzy
 msgid "Powering on the VM instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 #, fuzzy
 msgid "Creating Snapshot of the VM instance"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-#, fuzzy
-msgid "instance not present"
-msgstr "instancia %s: rescatada"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 #, fuzzy
 msgid "Unregistering the VM"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 #, fuzzy
 msgid "Powering on the VM"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, 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:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Borrando usuario %s"
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+#, fuzzy
+msgid "instance not present"
+msgstr "instancia %s: rescatada"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Borrando usuario %s"
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10363,7 +10397,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10373,14 +10407,14 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 "El punto de montaje %(mountpoint)s esta unido a la instancia "
 "%(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
@@ -10390,118 +10424,113 @@ msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "Imposible desasociar volumen %s"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 "El punto de montaje %(mountpoint)s se desligó de la instancia "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
-#, python-format
-msgid "Failed to exchange keys: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:224
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to update password: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
-#, fuzzy, python-format
-msgid "Failed to reset network: %(resp)r"
-msgstr "Fallo al generar metadatos para la ip %s"
+#: nova/virt/xenapi/agent.py:290
+#, python-format
+msgid "Failed to reset network: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10520,54 +10549,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obtenida excepción %s"
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr "Lanzando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, 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:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
-msgstr "Llamando %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10576,21 +10605,21 @@ msgstr ""
 "xenapi.fake no tiene una implementación para %s o ha sido llamada con un "
 "número incorrecto de argumentos"
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, fuzzy, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10622,7 +10651,7 @@ msgstr "Encontrada una red no única para el puente %s"
 msgid "Found no network for bridge %s"
 msgstr "No se ha encontrado red para el puente %s"
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10631,37 +10660,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "Imposible desasociar volumen %s"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10672,7 +10701,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10711,37 +10740,37 @@ msgstr "el grupo %s ya existe"
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Imposible desconectar VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10750,297 +10779,311 @@ msgstr ""
 "VDI creado %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
 "sobre %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
-#, fuzzy, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
-msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
+#: nova/virt/xenapi/vm_utils.py:1135
+#, python-format
+msgid "Asking xapi to fetch vhd image %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Tamaño para imagen %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando VDI %s a /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destruído"
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Buscando vid %s para el kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s está todavía disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s tiene origen en %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Ejecutando pygrub contra %s"
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen Encontrado %s"
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen no encontrado. Reiniciando HVM"
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11048,170 +11091,165 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, fuzzy, python-format
 msgid "Importing image upload handler: %s"
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 #, fuzzy
 msgid "Starting instance"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Finalizado el snapshot y la subida de la VM %s"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11220,116 +11258,114 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "configurando la red del host"
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
-#, fuzzy, python-format
-msgid "Creating VIF for network %(network_ref)s"
-msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1571
+#, python-format
+msgid "Creating VIF for network %s"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
-#, fuzzy, python-format
-msgid "Creating SR %(label)s"
-msgstr "configurando la red del host"
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
-#, fuzzy, python-format
-msgid "Introducing SR %(label)s"
-msgstr "Introduciendo %s..."
+#, python-format
+msgid "Introducing SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
 #, fuzzy
@@ -11378,25 +11414,25 @@ msgstr "Inposible insertar VDI para SR %s"
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
-#, fuzzy, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
-msgstr "La instacia %(instance_id)s no esta suspendida"
+#: nova/virt/xenapi/volumeops.py:143
+#, python-format
+msgid "Skipping detach because VBD for %s was not found"
+msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
 #, python-format
@@ -11406,7 +11442,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, fuzzy, python-format
 msgid "upload_vhd failed: %r"
 msgstr "No encontrado: %s"
@@ -11459,8 +11495,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr "acción: %s"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr "Tipo de instancia inválido %(instance_type)s."
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "Ejecutando instancias: %s"
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
 #~ msgstr ""
 
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "instancia %s: arrancada"
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "La instacia %(instance_id)s no esta suspendida"
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr "La instacia %(instance_id)s no esta suspendida"
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr "Fallo al generar metadatos para la ip %s"
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr "Llamando %(localname)s %(impl)s"
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "Imposible desasociar volumen %s"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr "configurando la red del host"
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr "Introduciendo %s..."
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
+#~ msgstr "La instacia %(instance_id)s no esta suspendida"
+
diff --git a/nova/locale/fi_FI/LC_MESSAGES/nova.po b/nova/locale/fi_FI/LC_MESSAGES/nova.po
index 649e4b49c..3be94d7e7 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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) "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 815b37157..fcb282e5e 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -182,7 +182,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr "La paire de clés de donnée n'est pas valide"
 
@@ -1062,217 +1062,222 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, 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:1081
+#: nova/exception.py:1085
 #, 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:1086
+#: nova/exception.py:1090
 #, 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:1090
+#: nova/exception.py:1094
 #, 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:1094
+#: nova/exception.py:1098
 #, 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:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, 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:1118
+#: nova/exception.py:1122
 #, 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:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
@@ -1281,122 +1286,122 @@ msgstr ""
 "Montage du volume %(volume_id)s sur l'instance %(instance_id)s en tant "
 "que %(device)s"
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, 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:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, 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:1173
+#: nova/exception.py:1177
 #, 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:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, 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:1209
+#: nova/exception.py:1213
 #, 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:1214
+#: nova/exception.py:1218
 #, 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:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1419,7 +1424,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
@@ -1457,31 +1462,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "Démarrage du noeud %(topic)s (version %(vcs_string)s)"
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Service détruit sans entrée dans la base de données"
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1495,62 +1500,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr "Debug dans le rappel : %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "L'adresse du lien local n'a pas été trouvé :%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Impossible de trouver l'IP du lien local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend invalide : %s"
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1631,11 +1636,11 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr "Trop d'erreur d'authentification"
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1645,116 +1650,116 @@ msgstr ""
 "d'authentification et sera par conséquent vérouillée pour %(lock_mins)d "
 "minutes."
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Echec d'authentification : %s"
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Trop d'erreur d'authentification"
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 "Requête non authorisé pour le controlleur=%(controller)s et "
 "l'action=%(action)s"
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "\"Instance non trouvée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "\"Volume non trouvé\" remonté : %s"
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "\"Non trouvé\" remonté : %s"
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Une erreur inopinée à eu lieu. Merci d'essayer votre requête à nouveau."
@@ -1766,273 +1771,273 @@ msgstr ""
 "Requête API non supportée : controleur = %(controller)s, action = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, 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:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr "Création du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Suppression du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, 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:623
+#: nova/api/ec2/cloud.py:634
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Le protocole IP %(protocol)s est invalide"
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr "Pas de règle pour les paramètres spécifiés."
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, 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:759
+#: nova/api/ec2/cloud.py:770
 #, 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:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 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:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, 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:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 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:916
+#: nova/api/ec2/cloud.py:927
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Dé-montage du volume %s"
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribut non reconnu : %s"
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "Allocation d'adresse"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 #, fuzzy
 msgid "No more floating IPs available"
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "Désallocation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, 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:1260
+#: nova/api/ec2/cloud.py:1271
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr "Début de la destruction d'instance"
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr "Dé-enregitrement de l'image %s"
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, 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:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr "Utilisateur ou groupe non spécifié"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "Seul le group \"tous\" est supporté"
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 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:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Mis à jour de la publication de l'image %s"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: récupérée"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Le cidr %(cidr)s est invalide"
@@ -2831,7 +2836,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3155,7 +3160,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3184,34 +3189,34 @@ msgstr "Backend invalide : %s"
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Appel du getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Appel du getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3349,18 +3354,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr "Aucun réseau défini."
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3400,26 +3422,33 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 #, fuzzy
 msgid "start instance"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 #, fuzzy
 msgid "stop instance"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "action: %s"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3656,31 +3685,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-#, fuzzy
-msgid "Instance type for vpn instances"
-msgstr "L'instance de type %(instance_type)s est invalide."
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr "Réseau à passer à la configuration d'openvpn"
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr "Masque réseau à passer à la configuration d'openvpn"
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Démarrage du VPN pour %s"
@@ -3690,35 +3718,35 @@ 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:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3739,322 +3767,322 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "%s reçu"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "network"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 #, fuzzy
 msgid "IP address"
 msgstr "adresse de départ"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Aucunes IPs fixes trouvées."
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "adresse de départ"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 #, fuzzy
 msgid "No networks found"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s est requis pour créer un réseau."
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Le service %(service_id)s ne peut pas être trouvé."
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Le service %(service_id)s ne peut pas être trouvé."
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instance %s: récupérée"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4112,57 +4140,57 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Impossible d'attacher le volume à l'instance %s"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Démarrage de %s instances..."
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Début de la destruction d'instance"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, 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:1257
+#: nova/compute/api.py:1258
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Début de la destruction d'instance"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Va essayer d'arrêter %s"
@@ -4172,153 +4200,153 @@ msgstr "Va essayer d'arrêter %s"
 msgid "Going to try to start instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Création du groupe de sécurité %s"
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorisation du groupe de sécurité %s"
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4377,64 +4405,52 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4443,647 +4459,654 @@ msgstr ""
 "Impossible de migrer l'instance (%(instance_id)s) vers l'hôte actuel "
 "(%(host)s)."
 
-#: nova/compute/manager.py:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Échec du redémarrage de l'instance"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Dé-montage du volume %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "Instance actives : %s"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: re-démarrée"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
-#, fuzzy, python-format
-msgid "injecting file to %(path)s"
-msgstr "Injection du chemin d'accès : '%s'"
+#: nova/compute/manager.py:2050
+#, python-format
+msgid "injecting file to %s"
+msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: dé-récupération"
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: récupération des diagnostiques"
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 #, fuzzy
 msgid "Reset network"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 #, fuzzy
 msgid "Inject network info"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 #, fuzzy
 msgid "Get console output"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, 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:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Démontage de volume d'une instance inconnue %s"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, 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:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "Le réseau %(network_id)s n'a pas été trouvé."
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "L'hôte %(host)s ne peut pas être trouvé."
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, 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:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
+#: nova/compute/manager.py:3691
+#, python-format
+msgid "Instance %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: a démarrée"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
@@ -5184,11 +5207,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5198,7 +5221,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5294,11 +5317,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Échec du redémarrage de l'instance"
@@ -5317,44 +5340,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5371,57 +5394,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5445,7 +5468,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5617,23 +5640,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5658,110 +5681,110 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d est dépassé, re-démarrage de dnsmasq"
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq à renvoyé %s"
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d est dépassé, re-démarrage de dnsmasq"
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "La destruction de radvd à renvoyé %s"
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d est dépassé, re-démarrage radvd"
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Backend invalide : %s"
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Démarrage de l'interface VLAN %s"
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "L'interface %(interface)s non trouvée."
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Erreur au démarrage xvp : %s"
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 #, fuzzy
 msgid "network allocations"
 msgstr "Aucun disque sur %(location)s"
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5769,98 +5792,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s libérée qui n'était pas allouée"
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "La somme du nombre de réseau et le début de vlan ne peut excéder 4094"
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5990,7 +6013,7 @@ 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:262
+#: nova/network/security_group/quantum_driver.py:263
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Erreur interceptée : %s"
@@ -6005,48 +6028,48 @@ msgstr "Suppression du groupe de sécurité %s"
 msgid "Security group id should be uuid"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, 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:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Erreur interceptée : %s"
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, 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:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, 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:446
+#: nova/network/security_group/quantum_driver.py:444
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6069,12 +6092,12 @@ msgstr "Erreur au démarrage xvp : %s"
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6780,7 +6803,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: 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."
@@ -6900,7 +6923,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6939,7 +6962,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7196,71 +7219,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr "Instance actives : %s"
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Après l'arrêt d'instances : %s"
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7270,22 +7293,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7352,36 +7375,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr "L'interface %(interface)s non trouvée."
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7391,25 +7414,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7418,25 +7441,25 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 #, fuzzy
 msgid "Filters added to instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8217,17 +8240,17 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 #, fuzzy
 msgid "get_host_stats called"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, fuzzy, python-format
 msgid "Host IP address is: %s"
 msgstr "Désallocation de l'adresse %s"
@@ -8573,12 +8596,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:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, 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:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Injection du chemin d'accès : '%s'"
@@ -8744,7 +8767,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8763,258 +8786,268 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "Le groupe de volume %s n'existe pas"
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr "Connexion à libvirt interrompue"
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Aucun réseau défini."
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Aucun réseau défini."
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: re-démarrée"
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 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:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, 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:1930
+#: nova/virt/libvirt/driver.py:1959
 #, 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:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9022,73 +9055,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, 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:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9096,50 +9131,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9149,67 +9184,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Echec d'authentification : %s"
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9220,25 +9255,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9425,7 +9460,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9462,14 +9497,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9477,7 +9512,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9485,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9493,7 +9528,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9501,87 +9536,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "le groupe %s existe déjà"
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9688,26 +9723,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr "La connexion à Melange a échoué"
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9854,32 +9889,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9889,39 +9924,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9930,17 +9965,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr "action: %s"
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9961,7 +9996,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -10004,57 +10039,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -10062,318 +10097,317 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 #, fuzzy
 msgid "Powering on the VM instance"
 msgstr "Démarrage de %s instances..."
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 #, fuzzy
 msgid "Creating Snapshot of the VM instance"
 msgstr "Création d'une instance raw"
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-#, fuzzy
-msgid "instance not present"
-msgstr "instance %s: récupérée"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Nested renvoi %s"
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 #, fuzzy
 msgid "Unregistering the VM"
 msgstr "Dé-enregitrement de l'image %s"
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 #, fuzzy
 msgid "Powering on the VM"
 msgstr "Démarrage de %s instances..."
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, 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:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+#, fuzzy
+msgid "instance not present"
+msgstr "instance %s: récupérée"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Impossible de trouver le volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10436,7 +10470,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10446,14 +10480,14 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "Impossible de trouver le volume %s"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 "Le point de montage %(mountpoint)s a été attaché à l'instance "
 "%(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
@@ -10463,118 +10497,113 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "Impossible de détacher le volume %s"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
-#, fuzzy, python-format
-msgid "Failed to reset network: %(resp)r"
-msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
+#: nova/virt/xenapi/agent.py:290
+#, python-format
+msgid "Failed to reset network: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erreur OpenSSL : %s"
@@ -10594,54 +10623,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Impossible de déchiffrer la clef privée : %s"
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr "Reçu exception : %s"
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr "Fonction non implémentée"
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, 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:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
-msgstr "Appel %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10650,21 +10679,21 @@ msgstr ""
 "xenapi.fake n'a pas d'implementation pour %s ou il a été appelé avec le "
 "mauvais nombre d'arguments"
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, fuzzy, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr "L'hôte de calcul %(host)s ne peut pas être trouvé."
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10696,7 +10725,7 @@ msgstr "Réseau non unique trouvé pour le bridge %s"
 msgid "Found no network for bridge %s"
 msgstr "Aucun réseau trouvé pour le bridge %s"
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10705,37 +10734,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "Impossible de détacher le volume %s"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10746,7 +10775,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10785,37 +10814,37 @@ msgstr "le groupe %s existe déjà"
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Impossible de deconnecter le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10824,232 +10853,246 @@ msgstr ""
 "VDI créé %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on"
 " %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "Le quota ne peut pas être trouvé"
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
-#, fuzzy, python-format
-msgid "No primary VDI found for %(vm_ref)s"
-msgstr "Aucun id destination trouvé pour le volume %(volume_id)s."
+#: nova/virt/xenapi/vm_utils.py:645
+#, python-format
+msgid "No primary VDI found for %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
-#, fuzzy, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
-msgstr "Demande de chargement à xapi de %(vdi_uuids)s en tant qu'ID %(image_id)s"
+#: nova/virt/xenapi/vm_utils.py:1135
+#, python-format
+msgid "Asking xapi to fetch vhd image %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Image %(image_location)s enregistré avec l'id %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Taille de l'image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copie de VDI %s vers /boot/guest sur dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Noyau/Ramdisk VDI %s détruit"
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Recherche du VDI %s pour le PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr "Le VDI %s est toujours disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-parcours de SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s à pour parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -11058,66 +11101,66 @@ msgstr ""
 "L'UUID parent %(parent_uuid)s ne correspond pas au parent originel "
 "%(original_parent_uuid)s, attente de coalesence..."
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Connexion de VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Connexion de VBD %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruction de VBD pour la VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destruction de VBD pour la VDI %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Exécution de pygrub sur %s"
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen %s trouvé"
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Pas de kernel Xen trouvé.  Démarrage en HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11125,171 +11168,166 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Ecriture de la table de partitionnement %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, fuzzy, python-format
 msgid "Importing image upload handler: %s"
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 #, fuzzy
 msgid "Starting instance"
 msgstr "Création d'une instance raw"
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 #, fuzzy
 msgid "Starting VM"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Fin de l'instantané et du chargement de VM %s"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11298,118 +11336,116 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr "Fichiers noyau/ramdisk supprimés"
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
-#, fuzzy, python-format
-msgid "Creating VIF for network %(network_ref)s"
-msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1571
+#, python-format
+msgid "Creating VIF for network %s"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
-#, fuzzy, python-format
-msgid "Creating SR %(label)s"
-msgstr "réglage de l'hôte réseau"
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
-#, fuzzy, python-format
-msgid "Introducing SR %(label)s"
-msgstr "Introduction de %s"
+#, python-format
+msgid "Introducing SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
 #, fuzzy
@@ -11458,25 +11494,25 @@ msgstr "Impossible d'introduire le VDI pour SR %s"
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
-#, fuzzy, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
-msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
+#: nova/virt/xenapi/volumeops.py:143
+#, python-format
+msgid "Skipping detach because VBD for %s was not found"
+msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
 #, python-format
@@ -11486,7 +11522,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, fuzzy, python-format
 msgid "upload_vhd failed: %r"
 msgstr "\"Non trouvé\" remonté : %s"
@@ -11539,8 +11575,214 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr "action: %s"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr "L'instance de type %(instance_type)s est invalide."
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "Instance actives : %s"
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
 #~ msgstr ""
 
+#~ msgid "injecting file to %(path)s"
+#~ msgstr "Injection du chemin d'accès : '%s'"
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "Le réseau %(network_id)s n'a pas été trouvé."
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "L'hôte %(host)s ne peut pas être trouvé."
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr "Appel %(localname)s %(impl)s"
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "Impossible de détacher le volume %s"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr "Aucun id destination trouvé pour le volume %(volume_id)s."
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+#~ "Demande de chargement à xapi de "
+#~ "%(vdi_uuids)s en tant qu'ID %(image_id)s"
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr "réglage de l'hôte réseau"
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr "Introduction de %s"
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
+#~ msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
+
diff --git a/nova/locale/hr/LC_MESSAGES/nova.po b/nova/locale/hr/LC_MESSAGES/nova.po
index 5e6f97f58..7f965ae20 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Croatian "
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -179,7 +179,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1020,337 +1020,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1373,7 +1378,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1410,31 +1415,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1448,62 +1453,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1584,124 +1589,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1711,261 +1716,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2755,7 +2760,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3068,7 +3073,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3096,34 +3101,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3258,18 +3263,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3307,23 +3329,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3559,30 +3589,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3592,35 +3622,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3641,312 +3671,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3999,52 +4029,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4052,152 +4082,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4255,690 +4285,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5038,11 +5063,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5052,7 +5077,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5145,11 +5170,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5167,44 +5192,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5221,57 +5246,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5295,7 +5320,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5465,23 +5490,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5506,109 +5531,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5616,98 +5641,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5835,7 +5860,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5848,45 +5873,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5907,12 +5932,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6610,7 +6635,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6728,7 +6753,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6767,7 +6792,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7024,71 +7049,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7098,22 +7123,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7179,36 +7204,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7218,25 +7243,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7245,24 +7270,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8030,16 +8055,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8382,12 +8407,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8545,7 +8570,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8564,250 +8589,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8815,73 +8850,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8889,50 +8926,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8942,67 +8979,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9013,25 +9050,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9218,7 +9255,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9255,14 +9292,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9270,7 +9307,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9278,7 +9315,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9286,7 +9323,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9294,87 +9331,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9478,26 +9515,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9643,32 +9680,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9678,39 +9715,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9719,17 +9756,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9750,7 +9787,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9793,57 +9830,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9851,311 +9888,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10218,7 +10254,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10227,12 +10263,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10241,116 +10277,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10366,75 +10397,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10466,7 +10497,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10475,37 +10506,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10516,7 +10547,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10555,332 +10586,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10888,166 +10933,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11056,114 +11096,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11212,24 +11250,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11240,7 +11278,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11293,8 +11331,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/hu/LC_MESSAGES/nova.po b/nova/locale/hu/LC_MESSAGES/nova.po
index bc4fbaced..2cfce52b4 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hungarian "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/id/LC_MESSAGES/nova.po b/nova/locale/id/LC_MESSAGES/nova.po
index 4cf3f9a86..f0bf4745e 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Indonesian "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index 46b95fd33..d0c241982 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1022,337 +1022,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, 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:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, 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:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1375,7 +1380,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Impossibile riavviare l'istanza"
@@ -1413,31 +1418,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Servizio terminato che non ha entry nel database"
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1451,62 +1456,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1587,124 +1592,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1714,262 +1719,262 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "istanza %s: ripristino"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2763,7 +2768,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3081,7 +3086,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3109,34 +3114,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Dichiarando la coda %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Dichiarando la coda %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3271,18 +3276,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3320,26 +3342,33 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 #, fuzzy
 msgid "start instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 #, fuzzy
 msgid "stop instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "E' stato riscontrato un errore sconosciuto"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3576,30 +3605,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3609,35 +3638,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3658,316 +3687,316 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "ricevuto %s"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "istanza %s: ripristino"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4020,54 +4049,54 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Impossibile riavviare l'istanza"
@@ -4077,152 +4106,152 @@ msgstr "Impossibile riavviare l'istanza"
 msgid "Going to try to start instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4281,702 +4310,697 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Impossibile riavviare l'istanza"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "Impossibile montare il volume all'istanza %s"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "istanza %s: ricezione diagnostiche"
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 #, fuzzy
 msgid "Reset network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, 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:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, 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:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "istanza %s: creazione snapshot in corso"
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "istanza %s: sospensione in corso"
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5076,11 +5100,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5090,7 +5114,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5186,11 +5210,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Impossibile riavviare l'istanza"
@@ -5209,44 +5233,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5263,57 +5287,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5337,7 +5361,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5508,23 +5532,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5549,109 +5573,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Avviando l'interfaccia VLAN %s"
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5659,98 +5683,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5880,7 +5904,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5893,45 +5917,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5952,12 +5976,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6661,7 +6685,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6779,7 +6803,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6818,7 +6842,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7075,71 +7099,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7149,22 +7173,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7230,36 +7254,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7269,25 +7293,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7296,25 +7320,25 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 #, fuzzy
 msgid "Filters added to instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8089,16 +8113,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8444,12 +8468,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:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8615,7 +8639,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8634,254 +8658,264 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: creato con successo"
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 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:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8889,73 +8923,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8963,50 +8999,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9016,67 +9052,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9087,25 +9123,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9292,7 +9328,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9329,14 +9365,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9344,7 +9380,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9352,7 +9388,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9360,7 +9396,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9368,87 +9404,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9554,26 +9590,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9719,32 +9755,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9754,39 +9790,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9795,17 +9831,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9826,7 +9862,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9869,57 +9905,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9927,312 +9963,311 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-#, fuzzy
-msgid "instance not present"
-msgstr "istanza %s: ripristino"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, 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:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+#, fuzzy
+msgid "instance not present"
+msgstr "istanza %s: ripristino"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10295,7 +10330,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10305,12 +10340,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
@@ -10320,116 +10355,111 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10445,75 +10475,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr "Sollevando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
-msgstr "Chiamando %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Dichiarando la coda %s"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10545,7 +10575,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10554,37 +10584,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "Impossibile smontare il volume %s"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10595,7 +10625,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10634,333 +10664,347 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s distrutti"
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Cercando vdi %s per kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10968,169 +11012,164 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, fuzzy, python-format
 msgid "Importing image upload handler: %s"
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 #, fuzzy
 msgid "Starting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11139,114 +11178,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11296,24 +11333,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11324,7 +11361,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11377,8 +11414,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr "E' stato riscontrato un errore sconosciuto"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "Impossibile montare il volume all'istanza %s"
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "istanza %s: creazione snapshot in corso"
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "istanza %s: sospensione in corso"
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr "Chiamando %(localname)s %(impl)s"
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "Impossibile smontare il volume %s"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/it_IT/LC_MESSAGES/nova.po b/nova/locale/it_IT/LC_MESSAGES/nova.po
index 35d4f2432..408217e41 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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) "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index d28aaf550..98be6cc06 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1024,337 +1024,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "イメージをループバック %s にアタッチできません。"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "イメージをループバック %s にアタッチできません。"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "%s を停止しようとしています"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "%s を停止しようとしています"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, 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:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1377,7 +1382,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
@@ -1415,31 +1420,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "%(topic)s ノードを開始しています (バージョン %(vcs_string)s)"
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "データベースにエントリの存在しないサービスを終了します。"
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1453,62 +1458,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr "コールバック中のデバッグ: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "リンクローカルアドレスが見つかりません: %s"
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "%(interface)s のローカルIPアドレスのリンクが取得できません:%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "不正なバックエンドです: %s"
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1589,125 +1594,125 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr "認証失敗の回数が多すぎます。"
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr "アクセスキー %(access_key)s は %(failures)d 回認証に失敗しましたので、%(lock_mins)d 分間ロックします。"
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "%s の認証に失敗しました。"
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "認証失敗の回数が多すぎます。"
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr "アクション(action): %s"
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "引数: %(key)s\t\t値: %(value)s"
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "コントローラ=%(controller)s とアクション=%(action)s 用の許可されていないリクエスト"
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound が発行されました: %s"
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound が発行されました: %s"
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound 発生: %s"
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "予期しないエラー発生: %s"
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "予期しないエラー発生: %s"
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "未知のエラーが発生しました。再度リクエストを実行してください。"
@@ -1717,265 +1722,265 @@ msgstr "未知のエラーが発生しました。再度リクエストを実行
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "未サポートの API リクエスト: コントローラ = %(controller)s, アクション = %(action)s"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "プライベートキーの復号に失敗しました: %s"
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair: キーペア %s を作成します。"
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair: キーペア %s を削除します。"
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "有効なルールを作成する為の十分なパラメータがありません"
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr "指定されたパラメータに該当するルールがありません。"
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "指定されたルールは既にグループ %s に存在しています。"
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 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:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, 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:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "アトリビュート %s はサポートされていません。"
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "Allocate address: アドレスを割り当てます。"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "Release address: アドレス %s を開放します。"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, 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:1260
+#: nova/api/ec2/cloud.py:1271
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Disassociate address: アドレス %s の関連付けを解除します。"
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Disassociate address: アドレス %s の関連付けを解除します。"
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address: アドレス %s の関連付けを解除します。"
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance: インスタンス %r を再起動します。"
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image: イメージ %s を登録解除します。"
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, 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:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr "ユーザまたはグループが指定されていません。"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "グループ  \"all\" のみサポートされています。"
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr "operation_type は add または remove の何れかである必要があります。"
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "イメージ %s の公開設定を更新します。"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "インスタンス %s: rescued"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2771,7 +2776,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3092,7 +3097,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "インスタンス %(instance_id)s にアドレス %(public_ip)s を割り当て"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3121,34 +3126,34 @@ msgstr "不正なバックエンドです: %s"
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "getter %s をコールします。"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "getter %s をコールします。"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3285,18 +3290,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
+#, python-format
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
 #, python-format
-msgid "Quota for %s should be integer."
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3335,26 +3357,33 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 #, fuzzy
 msgid "start instance"
 msgstr "Reboot instance: インスタンス %r を再起動します。"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 #, fuzzy
 msgid "stop instance"
 msgstr "Reboot instance: インスタンス %r を再起動します。"
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "アクション(action): %s"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3591,31 +3620,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-#, fuzzy
-msgid "Instance type for vpn instances"
-msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr "openvpnの設定に入れるネットワークの値"
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr "openvpnの設定に入れるネットマスクの値"
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "%s 用のVPNを起動します。"
@@ -3625,35 +3653,35 @@ msgstr "%s 用のVPNを起動します。"
 msgid "Failed to load %s"
 msgstr "ボリューム %s の存在が確認できません。"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3674,320 +3702,320 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "受信： %s"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "network"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 #, fuzzy
 msgid "IP address"
 msgstr "開始アドレス"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "開始アドレス"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 #, fuzzy
 msgid "No networks found"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "Reboot instance: インスタンス %r を再起動します。"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "予期しないエラー発生: %s"
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "インスタンス %s: rescued"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4041,57 +4069,57 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "インスタンス %s にボリュームを接続(attach)できません。"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "%s 個のインスタンスの起動を始めます…"
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "%s を停止しようとしています"
@@ -4101,153 +4129,153 @@ msgstr "%s を停止しようとしています"
 msgid "Going to try to start instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "VM %s に対するスナップショットを開始します。"
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group: セキュリティグループ %s を作成します。"
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "VBD %s の削除に失敗しました。"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "VBD %s の削除に失敗しました。"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress: セキュリティグループ許可 %s"
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4306,711 +4334,706 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "インスタンス終了処理を開始します。"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "予期しないエラー発生: %s"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance: インスタンス %s を再起動します。"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance: インスタンス %s を再起動します。"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "インスタンス %s は実行中です。"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "インスタンス%s: 再起動しました。"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
-#, fuzzy, python-format
-msgid "injecting file to %(path)s"
-msgstr "ファイルパス '%s' を埋め込んでいます"
+#: nova/compute/manager.py:2050
+#, python-format
+msgid "injecting file to %s"
+msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 #, fuzzy
 msgid "Unrescuing"
 msgstr "Unrescuing: インスタンス %s をアンレスキューします。"
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "retrieving diagnostics: インスタンス %s の診断情報を取得します。"
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 #, fuzzy
 msgid "Reset network"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 #, fuzzy
 msgid "Inject network info"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "コンソールを追加しています"
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 #, fuzzy
 msgid "Getting spice console"
 msgstr "コンソールを追加しています"
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "ボリュームを未知のインスタンス %s からデタッチします。"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "インスタンス %s: 起動しました。"
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "インスタンス %s: 起動しました。"
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Deleting user: ユーザ %s を削除します。"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Deleting user: ユーザ %s を削除します。"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5110,11 +5133,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5124,7 +5147,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5218,11 +5241,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5240,44 +5263,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5294,57 +5317,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5368,7 +5391,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5539,23 +5562,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5580,109 +5603,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d は無効です。dnsmasqを再実行します。"
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "dnsmasqに対してhupを送信しましたが %s が発生しました。"
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d は無効です。dnsmasqを再実行します。"
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "radvd  停止が %s 例外を発行しました"
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d がストールしているので radvd を再実行しています…"
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "不正なバックエンドです: %s"
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "VLANインタフェース %s を開始します。"
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "%s 用のブリッジインタフェースを開始します。"
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "プライベートキーの復号に失敗しました: %s"
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "%s 用のブリッジインタフェースを開始します。"
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "xvp の開始中にエラー: %s"
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5690,98 +5713,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "リースしていないIP %s が開放されました。"
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "ネットワークの数とVLANの開始番号の和は 4094 より大きくできません。"
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5911,7 +5934,7 @@ 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:262
+#: nova/network/security_group/quantum_driver.py:263
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "エラー %s をキャッチしました。"
@@ -5926,46 +5949,46 @@ msgstr "Delete security group: セキュリティグループ %s を削除しま
 msgid "Security group id should be uuid"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Authorize security group ingress: セキュリティグループ許可 %s"
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5986,12 +6009,12 @@ msgstr "xvp の開始中にエラー: %s"
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6695,7 +6718,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6813,7 +6836,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6852,7 +6875,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7109,71 +7132,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr "インスタンス %s は実行中です。"
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "インスタンス %s を終了した後です。"
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7183,22 +7206,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7265,36 +7288,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7304,25 +7327,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7331,24 +7354,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8123,17 +8146,17 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 #, fuzzy
 msgid "get_host_stats called"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, fuzzy, python-format
 msgid "Host IP address is: %s"
 msgstr "Release address: アドレス %s を開放します。"
@@ -8479,12 +8502,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "ファイルパス '%s' を埋め込んでいます"
@@ -8650,7 +8673,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8669,252 +8692,262 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "libvirt %s へ接続します。"
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "ボリュームグループ%sが存在しません。"
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr "libvirtへの接続が切れています。"
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "libvirt %s へ接続します。"
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "%s を停止しようとしています"
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "インスタンス%s: 再起動しました。"
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "データ: %(data)r, ファイルパス: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, 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:1930
+#: nova/virt/libvirt/driver.py:1959
 #, 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:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8922,73 +8955,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8996,50 +9031,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9049,67 +9084,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "%s の認証に失敗しました。"
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9120,25 +9155,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9325,7 +9360,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9362,14 +9397,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9377,7 +9412,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9385,7 +9420,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9393,7 +9428,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9401,87 +9436,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9586,26 +9621,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9751,32 +9786,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9786,39 +9821,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9827,17 +9862,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr "アクション(action): %s"
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9858,7 +9893,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9901,57 +9936,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9959,318 +9994,317 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 #, fuzzy
 msgid "Powering on the VM instance"
 msgstr "%s 個のインスタンスの起動を始めます…"
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 #, fuzzy
 msgid "Creating Snapshot of the VM instance"
 msgstr "raw instanceを生成します。"
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-#, fuzzy
-msgid "instance not present"
-msgstr "インスタンス %s: rescued"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "xvp を再起動しています"
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "ネストした戻り値: %s"
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 #, fuzzy
 msgid "Unregistering the VM"
 msgstr "De-registering image: イメージ %s を登録解除します。"
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 #, fuzzy
 msgid "Powering on the VM"
 msgstr "%s 個のインスタンスの起動を始めます…"
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Deleting user: ユーザ %s を削除します。"
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+#, fuzzy
+msgid "instance not present"
+msgstr "インスタンス %s: rescued"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Deleting user: ユーザ %s を削除します。"
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "ボリューム %s の存在が確認できません。"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10333,7 +10367,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10343,12 +10377,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "ボリューム %s の存在が確認できません。"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s にマウントポイント %(mountpoint)s を接続(attach)しました"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
@@ -10358,116 +10392,111 @@ msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "ボリューム %s を切断(detach)できません"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "getter %s をコールします。"
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
-#, python-format
-msgid "Failed to exchange keys: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:224
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to update password: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
-#, fuzzy, python-format
-msgid "Failed to reset network: %(resp)r"
-msgstr "ip %s に対するメタデータの取得に失敗しました。"
+#: nova/virt/xenapi/agent.py:290
+#, python-format
+msgid "Failed to reset network: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL エラー: %s"
@@ -10486,75 +10515,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "プライベートキーの復号に失敗しました: %s"
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr "例外 %s が発生しました。"
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr "NotImplemented 例外を発生させます。"
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake には %s が実装されていません。"
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
-msgstr "%(localname)s %(impl)s を呼び出します。"
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr "getter %s をコールします。"
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "getter %s をコールします。"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr "xenapi.fake に %s に関する実装がないか、引数の数が誤っています。"
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10586,7 +10615,7 @@ msgstr "ブリッジ %s に対してブリッジが複数存在します。"
 msgid "Found no network for bridge %s"
 msgstr "ブリッジ %s に対するネットワークが存在しません。"
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10595,37 +10624,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "ボリューム %s を切断(detach)できません"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10636,7 +10665,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10675,37 +10704,37 @@ msgstr "グループ %s は既に存在しています。"
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "VBD %s の unplug に失敗しました。"
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "VBD %s の削除に失敗しました。"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデバイス(VBD) %(vbd_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデバイス(VBD) %(vbd_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10714,298 +10743,312 @@ msgstr ""
 "%(sr_ref)s 上に VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, "
 "%(read_only)s) を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "VM %s に対するスナップショットを開始します。"
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
-#, fuzzy, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
-msgstr "ID %(image_id)s として %(vdi_uuids)s のアップロードの為に xapi を問い合わせしています"
+#: nova/virt/xenapi/vm_utils.py:1135
+#, python-format
+msgid "Asking xapi to fetch vhd image %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "イメージ %(image_location)s が ID %(image_id)s で登録されました"
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "イメージ %(image)s のサイズ:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "ドメイン0 上の /boot/guest に VDI %s をコピー中"
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "カーネル/RAMディスク VDI %s が削除されました"
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "PV kernelのvdi %s を取得します。"
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s は依然として存在しています。"
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "SR %s を再スキャンします。"
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s の親は %(parent_ref)s です"
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "親 %(parent_uuid)s が元々の親 %(original_parent_uuid)s と一致しません。作成を待機しています…"
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "VBD %s を接続しています… "
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "仮想ブロックデバイス(VBD) %s の接続が完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "VDI %s 用の仮想ブロックデバイス(VBD)を削除しています… "
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "VDI %s 用の仮想ブロックデバイス(VBD)の削除が完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "%s に対して pygrub を実行しています"
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Xen Kernel %s が見つかりました。"
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 "No Xen kernel found.  Booting HVM.\r\n"
 "Xen 用カーネルが見つかりません。完全仮想化モード(HVM)で起動しています。"
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11013,170 +11056,165 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "パーティションテーブル %s の書き込みが完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, fuzzy, python-format
 msgid "Importing image upload handler: %s"
 msgstr "%s 用のブリッジインタフェースを開始します。"
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 #, fuzzy
 msgid "Starting instance"
 msgstr "raw instanceを生成します。"
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 #, fuzzy
 msgid "Starting VM"
 msgstr "xvp を再起動しています"
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "VM %s のスナップショットとアップロードが完了しました。"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11185,118 +11223,116 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "xvp を再起動しています"
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr "カーネル/RAMディスクファイルが削除されました"
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 #, fuzzy
 msgid "Destroying VM"
 msgstr "xvp を再起動しています"
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
-#, fuzzy, python-format
-msgid "Creating VIF for network %(network_ref)s"
-msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作成しています。"
+#: nova/virt/xenapi/vmops.py:1571
+#, python-format
+msgid "Creating VIF for network %s"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作成しています。"
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
-#, fuzzy, python-format
-msgid "Creating SR %(label)s"
-msgstr "ネットワークホストの設定をします。"
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
-#, fuzzy, python-format
-msgid "Introducing SR %(label)s"
-msgstr "%s を introduce します…"
+#, python-format
+msgid "Introducing SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
 #, fuzzy
@@ -11345,24 +11381,24 @@ msgstr "SR %s のVDIをintroduceできません。"
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11373,7 +11409,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, fuzzy, python-format
 msgid "upload_vhd failed: %r"
 msgstr "NotFound 発生: %s"
@@ -11426,8 +11462,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr "アクション(action): %s"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "インスタンス %s は実行中です。"
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr "ファイルパス '%s' を埋め込んでいます"
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "インスタンス %s: 起動しました。"
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "インスタンス %s: 起動しました。"
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr "ip %s に対するメタデータの取得に失敗しました。"
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr "%(localname)s %(impl)s を呼び出します。"
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "ボリューム %s を切断(detach)できません"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr "ID %(image_id)s として %(vdi_uuids)s のアップロードの為に xapi を問い合わせしています"
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作成しています。"
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr "ネットワークホストの設定をします。"
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr "%s を introduce します…"
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/ka_GE/LC_MESSAGES/nova.po b/nova/locale/ka_GE/LC_MESSAGES/nova.po
index 395e9c0ad..334143a6c 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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) "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index fa4dd2271..d26b731cf 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -177,7 +177,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2755,7 +2760,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3072,7 +3077,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3100,34 +3105,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3262,18 +3267,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3311,23 +3333,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3564,30 +3594,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3597,35 +3627,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3646,313 +3676,313 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4005,53 +4035,53 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4059,152 +4089,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4262,698 +4292,693 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "%s 볼륨 탈착에 실패했습니다"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "인스턴스 %s: 스냅샷 저장중"
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5053,11 +5078,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5067,7 +5092,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5160,11 +5185,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5182,44 +5207,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5236,57 +5261,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5310,7 +5335,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5480,23 +5505,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5521,109 +5546,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5631,98 +5656,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5850,7 +5875,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5863,45 +5888,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5922,12 +5947,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6625,7 +6650,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6743,7 +6768,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6782,7 +6807,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7039,71 +7064,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7113,22 +7138,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7194,36 +7219,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7233,25 +7258,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7260,24 +7285,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8051,16 +8076,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8405,12 +8430,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8575,7 +8600,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8594,250 +8619,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8845,73 +8880,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "%s 볼륨 탈착에 실패했습니다"
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8919,50 +8956,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8972,67 +9009,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9043,25 +9080,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9248,7 +9285,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9285,14 +9322,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9300,7 +9337,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9308,7 +9345,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9316,7 +9353,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9324,87 +9361,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9509,26 +9546,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9674,32 +9711,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9709,39 +9746,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9750,17 +9787,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9781,7 +9818,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9824,57 +9861,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9882,311 +9919,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10249,7 +10285,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10259,12 +10295,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 장착되었습니다"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
@@ -10274,116 +10310,111 @@ msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "%s 볼륨 탈착에 실패했습니다"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10399,75 +10430,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10499,7 +10530,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10508,37 +10539,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "%s 볼륨 탈착에 실패했습니다"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10549,7 +10580,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10588,332 +10619,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10921,168 +10966,163 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 #, fuzzy
 msgid "Starting instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11091,114 +11131,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11247,24 +11285,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11275,7 +11313,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11328,8 +11366,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "인스턴스 %s: 스냅샷 저장중"
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "%s 볼륨 탈착에 실패했습니다"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/ko_KR/LC_MESSAGES/nova.po b/nova/locale/ko_KR/LC_MESSAGES/nova.po
index 2a328cfb5..daa68fc76 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr "Keypair 데이터가 맞지 않습니다"
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "주소 할당"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "주소 릴리즈 %s"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2755,7 +2760,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3068,7 +3073,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3096,34 +3101,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3258,18 +3263,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3307,23 +3329,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3560,30 +3590,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3593,35 +3623,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3642,312 +3672,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4000,52 +4030,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4053,152 +4083,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4256,690 +4286,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5039,11 +5064,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5053,7 +5078,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5146,11 +5171,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5168,44 +5193,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5222,57 +5247,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5296,7 +5321,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5466,23 +5491,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5507,109 +5532,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5617,98 +5642,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5836,7 +5861,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5849,45 +5874,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5908,12 +5933,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6611,7 +6636,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6729,7 +6754,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6768,7 +6793,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7025,71 +7050,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7099,22 +7124,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7180,36 +7205,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7219,25 +7244,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7246,24 +7271,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8031,16 +8056,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8383,12 +8408,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8546,7 +8571,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8565,250 +8590,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8816,73 +8851,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8890,50 +8927,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8943,67 +8980,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9014,25 +9051,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9219,7 +9256,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9256,14 +9293,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9271,7 +9308,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9279,7 +9316,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9287,7 +9324,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9295,87 +9332,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9479,26 +9516,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9644,32 +9681,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9679,39 +9716,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9720,17 +9757,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9751,7 +9788,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9794,57 +9831,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9852,311 +9889,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10219,7 +10255,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10228,12 +10264,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10242,116 +10278,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10367,75 +10398,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10467,7 +10498,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10476,37 +10507,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10517,7 +10548,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10556,332 +10587,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10889,167 +10934,162 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "인스턴스 재시작 실패"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11058,114 +11098,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11214,24 +11252,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11242,7 +11280,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11295,8 +11333,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/ms/LC_MESSAGES/nova.po b/nova/locale/ms/LC_MESSAGES/nova.po
index 0df46354d..9b51aef4c 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Malay "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/nb/LC_MESSAGES/nova.po b/nova/locale/nb/LC_MESSAGES/nova.po
index 333c1c76b..c39808d22 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -179,7 +179,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1020,337 +1020,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr "Kvote overskredet"
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, 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:1086
+#: nova/exception.py:1090
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, 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:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Forventet objekt av typen: %s"
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1373,7 +1378,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1410,31 +1415,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1448,62 +1453,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Forventet objekt av typen: %s"
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "Tjenernavn er ikke en streng eller unicode"
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1584,124 +1589,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr "Signatur ikke gitt"
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1711,261 +1716,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr "Lag nøkkelpar %s"
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr "Importer nøkkel %s"
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Slett nøkkelpar %s"
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Ugyldig IP protokoll %(protocol)s."
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr "Ingen regel for de angitte parametrene."
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "Tildel adresse"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "Frigjør adresse %s"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr "bruker eller gruppe ikke spesifisert"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "kun gruppe \"all\" er støttet"
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2759,7 +2764,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3074,7 +3079,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3102,34 +3107,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3266,18 +3271,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr "Ingen nettverk definert."
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3316,23 +3338,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3568,30 +3598,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3601,35 +3631,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Kan ikke finne adressen %r"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3650,314 +3680,314 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 #, fuzzy
 msgid "IP address"
 msgstr "Tildel adresse"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 #, fuzzy
 msgid "No networks found"
 msgstr "Nettverk ikke funnet"
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4010,52 +4040,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4063,152 +4093,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4266,690 +4296,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "Nettverk ikke funnet"
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Kunne ikke hente metadata for ip:% s"
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5049,11 +5074,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5063,7 +5088,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5156,11 +5181,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5178,44 +5203,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5232,57 +5257,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5306,7 +5331,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5476,23 +5501,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5517,109 +5542,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5627,98 +5652,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5848,7 +5873,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5861,45 +5886,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5920,12 +5945,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6624,7 +6649,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6742,7 +6767,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6781,7 +6806,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7039,71 +7064,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7113,22 +7138,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7195,36 +7220,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr "Tjener ikke funnet"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7234,25 +7259,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7261,24 +7286,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8048,16 +8073,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, fuzzy, python-format
 msgid "Host IP address is: %s"
 msgstr "Frigjør adresse %s"
@@ -8400,12 +8425,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8563,7 +8588,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8582,252 +8607,262 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Ingen nettverk definert."
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Ingen nettverk definert."
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8835,73 +8870,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8909,50 +8946,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8962,67 +8999,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9033,25 +9070,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9238,7 +9275,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9275,14 +9312,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9290,7 +9327,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9298,7 +9335,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9306,7 +9343,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9314,87 +9351,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "Tjener ikke funnet"
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9498,26 +9535,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9663,32 +9700,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9698,39 +9735,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9739,17 +9776,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9770,7 +9807,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9813,57 +9850,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9871,311 +9908,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10238,7 +10274,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10248,12 +10284,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "Kan ikke finne adressen %r"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10263,116 +10299,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr "Kan ikke finne adressen %r"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10388,75 +10419,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, fuzzy, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10488,7 +10519,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10497,37 +10528,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10538,7 +10569,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10577,333 +10608,347 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10911,166 +10956,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11079,115 +11119,113 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "Feil nettverks-format"
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11236,24 +11274,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11264,7 +11302,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11317,8 +11355,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "Nettverk ikke funnet"
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/nl_NL/LC_MESSAGES/nova.po b/nova/locale/nl_NL/LC_MESSAGES/nova.po
index 0e59dbc16..67a46ac1c 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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) "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index e62e68a03..c3ccd79a4 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.274\n"
+"Project-Id-Version: nova jenkins.nova.propose.translation.update.278\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -177,7 +177,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1018,337 +1018,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1371,7 +1376,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1408,31 +1413,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1446,62 +1451,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1582,124 +1587,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1709,261 +1714,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2753,7 +2758,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3066,7 +3071,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3094,34 +3099,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3256,18 +3261,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
+#, python-format
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
 #, python-format
-msgid "Quota for %s should be integer."
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3305,23 +3327,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3557,30 +3587,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3590,35 +3620,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3639,312 +3669,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3997,52 +4027,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4050,152 +4080,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4253,690 +4283,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5036,11 +5061,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5050,7 +5075,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5143,11 +5168,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5165,44 +5190,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5219,57 +5244,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5293,7 +5318,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5463,23 +5488,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5504,109 +5529,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5614,98 +5639,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5833,7 +5858,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5846,45 +5871,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5905,12 +5930,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6608,7 +6633,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6726,7 +6751,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6765,7 +6790,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7022,71 +7047,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7096,22 +7121,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7177,36 +7202,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7216,25 +7241,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7243,24 +7268,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8028,16 +8053,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8380,12 +8405,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8543,7 +8568,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8562,250 +8587,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8813,73 +8848,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8887,50 +8924,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8940,67 +8977,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9011,25 +9048,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9216,7 +9253,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9253,14 +9290,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9268,7 +9305,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9276,7 +9313,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9284,7 +9321,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9292,87 +9329,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9476,26 +9513,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9641,32 +9678,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9676,39 +9713,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9717,17 +9754,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9748,7 +9785,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9791,57 +9828,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9849,311 +9886,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10216,7 +10252,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10225,12 +10261,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10239,116 +10275,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10364,75 +10395,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10464,7 +10495,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10473,37 +10504,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10514,7 +10545,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10553,332 +10584,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10886,166 +10931,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11054,114 +11094,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11210,24 +11248,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11238,7 +11276,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
diff --git a/nova/locale/pt/LC_MESSAGES/nova.po b/nova/locale/pt/LC_MESSAGES/nova.po
index bdd34f293..26f474ed5 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 06f31b060..d6a55a413 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1024,337 +1024,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, 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:1086
+#: nova/exception.py:1090
 #, 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:1090
+#: nova/exception.py:1094
 #, 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:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, 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:1106
+#: nova/exception.py:1110
 #, 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:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, 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:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, 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:1173
+#: nova/exception.py:1177
 #, 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:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, 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:1209
+#: nova/exception.py:1213
 #, 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:1214
+#: nova/exception.py:1218
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1377,7 +1382,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Falha ao obter metadados para o ip: %s"
@@ -1415,31 +1420,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Encerrado serviço que não tem entrada na base de dados"
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1453,62 +1458,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr "depuração em retorno de chamada: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Endereço para Link Local não encontrado: %s"
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Não foi possível atribuir um IP para o Link Local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend inválido: %s"
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1589,125 +1594,125 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr "Muitas falhas de autenticação."
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Falha de Autenticação: %s"
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Muitas falhas de autenticação."
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr "ação: %s"
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound lançado: %s"
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Ocorreu um erro desconhecido. Por favor tente sua requisição novamente."
@@ -1717,265 +1722,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:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr "Criar par de chaves %s"
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Remover par de chaves %s"
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Protocolo IP %(protocol)s é inválido."
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr "Não existe regra para os parâmetros especificados"
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Esta regra já existe no grupo %s"
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 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:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desanexar volume %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Desanexar volume %s"
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo não suportado: %s"
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "Alocar endereço"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar endereço %s"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr "Começando a terminar instâncias"
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instância %r"
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr "usuário ou grupo não especificado"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "apenas o grupo \"all\" é suportado"
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr "operation_type deve ser add ou remove"
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Atualizando publicidade da imagem %s"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "Instância não existe"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2773,7 +2778,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr "Instância não encontrada"
 
@@ -3095,7 +3100,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3124,34 +3129,34 @@ msgstr "Backend inválido: %s"
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Chamando o pai %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Chamando o pai %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3290,18 +3295,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr "Nenhuma rede definida."
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3340,26 +3362,33 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 #, fuzzy
 msgid "start instance"
 msgstr "Iniciando instância %s"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 #, fuzzy
 msgid "stop instance"
 msgstr "Reiniciar instância %r"
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "ação: %s"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3596,31 +3625,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-#, fuzzy
-msgid "Instance type for vpn instances"
-msgstr "tipo de instância %(instance_type)s é inválida."
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Executando VPN para %s"
@@ -3630,35 +3658,35 @@ msgstr "Executando VPN para %s"
 msgid "Failed to load %s"
 msgstr "Não foi possível criar volume"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3679,321 +3707,321 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "recebido %s"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "network"
 msgstr "instância %s: reset da rede"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 #, fuzzy
 msgid "IP address"
 msgstr "Alocar endereço"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "group %s já existe"
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 #, fuzzy
 msgid "No networks found"
 msgstr "Nenhuma rede definida."
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s é necessário para criar a rede."
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "Reiniciar instância %r"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "Instância não existe"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, fuzzy, python-format
 msgid "%s created"
 msgstr "_criar: %s"
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4046,57 +4074,57 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, 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:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, 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:1257
+#: nova/compute/api.py:1258
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Falhou ao reiniciar instância"
@@ -4106,153 +4134,153 @@ msgstr "Falhou ao reiniciar instância"
 msgid "Going to try to start instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Criar Grupo de Segurança %s"
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizada entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4311,710 +4339,705 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Falhou ao reiniciar instância"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Removendo rede com id %s"
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Desanexar volume %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando a instância %s"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "Reconstruindo instância %s"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Configurar senha do administrador"
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instância %s: desfazendo o resgate"
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Iniciando instância %s"
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instância não existe"
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instância %s: recuperando os diagnósticos"
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 #, fuzzy
 msgid "Reset network"
 msgstr "instância %s: reset da rede"
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 #, fuzzy
 msgid "Get console output"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, 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:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desconectando volume da instância desconhecida %s"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, 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:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "Rede %(network_id)s não foi encontrada."
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "Host %(host)s não encontrado."
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Falha ao obter metadados para o ip: %s"
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "A instância %(instance_id)s não está executando."
+#: nova/compute/manager.py:3691
+#, python-format
+msgid "Instance %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Remover volume com id: %s"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instância %s não encontrada"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Iniciando instância %s"
@@ -5114,11 +5137,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5128,7 +5151,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5223,11 +5246,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Falhou ao reiniciar instância"
@@ -5246,44 +5269,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5300,57 +5323,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5374,7 +5397,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, fuzzy, python-format
 msgid "fetching image %s from glance"
 msgstr "Removendo imagem %s"
@@ -5545,23 +5568,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5586,109 +5609,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d está ultrapassado, reiniciando dnsmasq"
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d está ultrapassado, reiniciando dnsmasq"
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d está ultrapassado, reiniciando radvd"
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Backend inválido: %s"
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Iniciando a VLAN %s"
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Iniciando instância %s"
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Interface %(interface)s não encontrada."
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Falha ao suspender instância"
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Iniciando instância %s"
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5696,98 +5719,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr "Rede já existe!"
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5917,7 +5940,7 @@ 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:262
+#: nova/network/security_group/quantum_driver.py:263
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Capturado o erro: %s"
@@ -5932,46 +5955,46 @@ msgstr "Excluir grupo de segurança %s"
 msgid "Security group id should be uuid"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Capturado o erro: %s"
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, 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:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5992,12 +6015,12 @@ msgstr "Configurar senha do administrador"
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6702,7 +6725,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: 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"
@@ -6820,7 +6843,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6859,7 +6882,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7116,71 +7139,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, fuzzy, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr "Endereço |%(address)s| não está alocado"
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7190,22 +7213,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, fuzzy, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr "Endereço |%(address)s| não está alocado"
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7272,36 +7295,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr "Instância não encontrada"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7311,25 +7334,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Não foi possível carregar o driver de virtualização: %s"
@@ -7339,25 +7362,25 @@ 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:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 #, fuzzy
 msgid "Filters added to instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8135,17 +8158,17 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 #, fuzzy
 msgid "get_host_stats called"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, fuzzy, python-format
 msgid "Host IP address is: %s"
 msgstr "Liberar endereço %s"
@@ -8491,12 +8514,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:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8662,7 +8685,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8681,258 +8704,268 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Nenhuma rede definida."
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Nenhuma rede definida."
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: criado com sucesso"
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 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:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, 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:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8940,73 +8973,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, 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:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9014,50 +9049,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9067,67 +9102,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Falha de Autenticação: %s"
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9138,25 +9173,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9343,7 +9378,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9380,14 +9415,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9395,7 +9430,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9403,7 +9438,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9411,7 +9446,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9419,87 +9454,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "group %s já existe"
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9605,26 +9640,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9770,32 +9805,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "nenhuma partição encontrada"
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9805,39 +9840,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr "Sessão inválida"
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9846,17 +9881,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr "ação: %s"
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9877,7 +9912,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9920,57 +9955,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9978,316 +10013,315 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 #, fuzzy
 msgid "Powering on the VM instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-#, fuzzy
-msgid "instance not present"
-msgstr "Instância não existe"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 #, fuzzy
 msgid "Unregistering the VM"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 #, fuzzy
 msgid "Powering on the VM"
 msgstr "Começando a terminar instâncias"
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Atualizando agente para %s"
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Remover volume com id: %s"
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+#, fuzzy
+msgid "instance not present"
+msgstr "Instância não existe"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Remover volume com id: %s"
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr "Obtendo o tamanho da imagem para a imagem %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10350,7 +10384,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10360,12 +10394,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Ponto de montagem %(mountpoint)s conectada à instância %(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
@@ -10375,116 +10409,111 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "Não foi possível criar volume"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Atualizando agente para %s"
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr "Configurar senha do administrador"
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr "Falhou em atualizar senha: %(resp)r"
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
-#, fuzzy, python-format
-msgid "Failed to reset network: %(resp)r"
-msgstr "Falhou em atualizar senha: %(resp)r"
+#: nova/virt/xenapi/agent.py:290
+#, python-format
+msgid "Failed to reset network: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erro de OpenSSL: %s"
@@ -10500,54 +10529,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr "Aumento não implementado"
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, 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:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
-msgstr "Chamando %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr "Chamando o pai %s"
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Chamando o pai %s"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10556,21 +10585,21 @@ msgstr ""
 "xenapi.fake não tem implementação para %s ou foi chamado com um número de"
 " argumentos inválido"
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, fuzzy, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr "Host %(host)s não encontrado."
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10602,7 +10631,7 @@ msgstr "Encontrado múltiplas redes para a bridge %s"
 msgid "Found no network for bridge %s"
 msgstr "Não foi encontrada rede para bridge %s"
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10611,37 +10640,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "Não é possível desconectar o volume %s"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10652,7 +10681,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10692,37 +10721,37 @@ msgstr "group %s já existe"
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Não é possível desconectar o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10731,299 +10760,311 @@ msgstr ""
 "VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) no SR "
 "%(sr_ref)s criada com sucesso."
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
-#, fuzzy, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+#: nova/virt/xenapi/vm_utils.py:1135
+#, python-format
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
-"Solicitando à xapi para realizar upload da imagem %(vdi_uuids)s com ID "
-"%(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Tamanho da imagem %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando o VDI %s de /boot/guest no dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk %s destruidos"
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Verificando o vdi %s para kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr "O VDI %s continua disponível"
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "O VHD %(vdi_uuid)s tem pai %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Conectando VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "O VDB %s foi conectado."
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruindo VBD para o VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "O VBD para o VDI %s foi destruído."
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Rodando pygrub novamente %s"
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen encontrado: %s"
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen não encontrado. Iniciando como HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11031,169 +11072,164 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
-#, fuzzy, python-format
-msgid "Updating progress to %(progress)d"
-msgstr "Atualizando agente para %s"
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
+#, python-format
+msgid "Updating progress to %d"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, fuzzy, python-format
 msgid "Importing image upload handler: %s"
 msgstr "Iniciando a Bridge para %s"
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 #, fuzzy
 msgid "Starting instance"
 msgstr "Iniciando instância %s"
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Falha ao suspender instância"
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11202,115 +11238,113 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
-#, fuzzy, python-format
-msgid "Creating VIF for network %(network_ref)s"
-msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1571
+#, python-format
+msgid "Creating VIF for network %s"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
-#, fuzzy, python-format
-msgid "Creating SR %(label)s"
-msgstr "Removendo rede com id %s"
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
-#, fuzzy, python-format
-msgid "Introducing SR %(label)s"
-msgstr "Introduzindo %s..."
+#, python-format
+msgid "Introducing SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
 #, fuzzy
@@ -11359,25 +11393,25 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
-#, fuzzy, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
-msgstr "A instância %(instance_id)s não está executando."
+#: nova/virt/xenapi/volumeops.py:143
+#, python-format
+msgid "Skipping detach because VBD for %s was not found"
+msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
 #, python-format
@@ -11387,7 +11421,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, fuzzy, python-format
 msgid "upload_vhd failed: %r"
 msgstr "NotFound lançado: %s"
@@ -11440,8 +11474,215 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr "ação: %s"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr "tipo de instância %(instance_type)s é inválida."
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "Reconstruindo instância %s"
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
 #~ msgstr ""
 
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "Rede %(network_id)s não foi encontrada."
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "Host %(host)s não encontrado."
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr "A instância %(instance_id)s não está executando."
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr "Falhou em atualizar senha: %(resp)r"
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr "Falhou em atualizar senha: %(resp)r"
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr "Chamando %(localname)s %(impl)s"
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "Não é possível desconectar o volume %s"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+#~ "Solicitando à xapi para realizar upload"
+#~ " da imagem %(vdi_uuids)s com ID "
+#~ "%(image_id)s"
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr "Atualizando agente para %s"
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr "Removendo rede com id %s"
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr "Introduzindo %s..."
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
+#~ msgstr "A instância %(instance_id)s não está executando."
+
diff --git a/nova/locale/ro/LC_MESSAGES/nova.po b/nova/locale/ro/LC_MESSAGES/nova.po
index f7364fa45..11c4412d9 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 19:37+0000\n"
 "PO-Revision-Date: 2013-06-10 18:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Romanian "
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -179,7 +179,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1020,337 +1020,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1373,7 +1378,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1410,31 +1415,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1448,62 +1453,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1584,124 +1589,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1711,261 +1716,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2755,7 +2760,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3068,7 +3073,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3096,34 +3101,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3258,18 +3263,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3307,23 +3329,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3559,30 +3589,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3592,35 +3622,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3641,312 +3671,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3999,52 +4029,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4052,152 +4082,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4255,690 +4285,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5038,11 +5063,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5052,7 +5077,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5145,11 +5170,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5167,44 +5192,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5221,57 +5246,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5295,7 +5320,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5465,23 +5490,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5506,109 +5531,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5616,98 +5641,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5835,7 +5860,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5848,45 +5873,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5907,12 +5932,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6610,7 +6635,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6728,7 +6753,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6767,7 +6792,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7024,71 +7049,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7098,22 +7123,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7179,36 +7204,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7218,25 +7243,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7245,24 +7270,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8030,16 +8055,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8382,12 +8407,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8545,7 +8570,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8564,250 +8589,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8815,73 +8850,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8889,50 +8926,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8942,67 +8979,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9013,25 +9050,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9218,7 +9255,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9255,14 +9292,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9270,7 +9307,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9278,7 +9315,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9286,7 +9323,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9294,87 +9331,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9478,26 +9515,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9643,32 +9680,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9678,39 +9715,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9719,17 +9756,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9750,7 +9787,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9793,57 +9830,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9851,311 +9888,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10218,7 +10254,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10227,12 +10263,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10241,116 +10277,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10366,75 +10397,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10466,7 +10497,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10475,37 +10506,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10516,7 +10547,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10555,332 +10586,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10888,166 +10933,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11056,114 +11096,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11212,24 +11250,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11240,7 +11278,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11293,8 +11331,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index a3aed0f22..a18a11d1e 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr "block_device_list %s"
@@ -185,7 +185,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1047,342 +1047,347 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Недостаточно памяти на узле сети compute для запуска %(uuid)s."
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Допустимый узел не найден. %(reason)s"
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr "Превышена квота"
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Копия %(instance_id)s не найдена."
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Консоль для копии %(instance_id)s не найдена."
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Том %(volume_id)s не найден."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Копия %(instance_id)s не найдена"
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Выполнение запуска копий"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Выполнение запуска копий"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, 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:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Проект %(project_id)s не найден."
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password не реализован в этой драйвере."
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Копия %(instance_id)s не переведена в режим восстановления"
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Копия %(instance_id)s не переведена в режим восстановления"
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Тип копии %(name)s уже существует."
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Ожидался объект типа: %s"
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1405,7 +1410,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Ошибка получения метаданных для ip: %s"
@@ -1443,31 +1448,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "Запуск узла сети (версия %(vcs_string)s) %(topic)s"
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Служба завершила работу из-за отсутствия записи базы данных"
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1481,62 +1486,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr "отладка в обратном вызове: %s"
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Недопустимый внутренний интерфейс: %s"
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Ожидался объект типа: %s"
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Недопустимая server_string: %s"
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' заняла %(total_time).2f с."
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "Выгрузка образа %s"
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Ошибка удаления контейнера: %s"
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1617,127 +1622,127 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr "Слишком много неудачных попыток аутентификации."
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Ошибка аутентификации: %s"
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Слишком много неудачных попыток аутентификации."
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr "действие: %s"
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 "Неавторизированный запрос для контроллера=%(controller)s и "
 "действия=%(action)s"
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1751,270 +1756,270 @@ msgstr ""
 "Неподдерживаемый запрос API: контроллер = %(controller)s, действие = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Создать снимок тома %s"
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Ошибка дешифрирования личного ключа: %s"
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr "Создание пары ключей %s"
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr "Импортировать ключ %s"
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Удаление пары ключей %s"
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Недостаточно параметров для сбора правильного правила."
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Недопустимый протокол IP %(protocol)s."
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr "Отсутствует правило для заданных параметров."
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Это правило уже существует в группе %s"
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Получить консольный вывод для копии %s"
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Создать том из снимка %s"
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Создание раздела %s ГБ"
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 #, fuzzy
 msgid "Delete Failed"
 msgstr "Ошибка создания"
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, 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:887
+#: nova/api/ec2/cloud.py:898
 #, fuzzy
 msgid "Attach Failed."
 msgstr "Ошибка создания"
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Отсоединить том %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Отсоединить том %s"
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "аттрибут не поддерживается: %s"
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "Выделить адрес"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "Присвоить адрес %s"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 #, fuzzy
 msgid "Unable to release IP Address."
 msgstr "Невозможно найти адрес %r"
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, 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:1260
+#: nova/api/ec2/cloud.py:1271
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Невозможно найти адрес %r"
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Невозможно найти адрес %r"
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Исключить адрес %s"
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr "Образ должен быть доступен"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr "Выполнение завершения работы копий"
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Перезагрузить копию %r"
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr "Выполнение остановки копий"
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr "Выполнение запуска копий"
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr "Исключение регистрации образа %s"
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, 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:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr "не указан пользователь или группа"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "поддерживается только группа \"все(all)\""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Обновление осведомлённости об образе %s"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Невозможно остановить копию в течении %d с."
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Перечень копий"
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "копия - %s не представлена"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Перечень копий"
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Недопустимый cidr %(cidr)s."
@@ -2821,7 +2826,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr "Копия не найдена"
 
@@ -3150,7 +3155,7 @@ msgstr ""
 "%(instance_id)s"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3179,34 +3184,34 @@ msgstr "Недопустимое состояние: '%s'"
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, fuzzy, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr "Перевод узла %(host)s в %(state)s."
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Выполняется вызов getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Обновление состояния узла"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3347,18 +3352,35 @@ msgstr "Добавление правила группы безопасност�
 msgid "Create networks failed"
 msgstr "Ошибка создания"
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3398,27 +3420,34 @@ msgstr "Группа безопасности не задана"
 msgid "Security group name cannot be empty"
 msgstr "Наименование группы безопасности не может отсутствовать"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 #, fuzzy
 msgid "start instance"
 msgstr "Запуск копии %s"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 #, fuzzy
 msgid "stop instance"
 msgstr "Выполнение остановки копий"
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "Неизвестная цепочка: %r"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 #, fuzzy
 msgid "Unknown service"
 msgstr "Ошибка аутентификации"
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3655,31 +3684,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-#, fuzzy
-msgid "Instance type for vpn instances"
-msgstr "Недопустимый тип копии %(instance_type)s."
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Запуск VPN для %s"
@@ -3689,35 +3717,35 @@ msgstr "Запуск VPN для %s"
 msgid "Failed to load %s"
 msgstr "Невозможно создать том"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "элемент не является потомком"
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3740,323 +3768,323 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "получено %s"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "network"
 msgstr "Восстановление сети"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 #, fuzzy
 msgid "IP address"
 msgstr "Выделить адрес"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "Тип тома %(name)s уже существует."
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "проект"
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 #, fuzzy
 msgid "No networks found"
 msgstr "Сеть не найдена"
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s необходимо для создания сети."
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "Выполнение остановки копий"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Служба %(service_id)s не найдена."
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Служба %(service_id)s не найдена."
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Непредвиденная ошибка: %s"
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 #, fuzzy
 msgid "PROJECT"
 msgstr "проект"
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "копия - %s не представлена"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 #, fuzzy
 msgid "Unknown error"
 msgstr "Ошибка аутентификации"
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, fuzzy, python-format
 msgid "%s created"
 msgstr "Таблица |%s| не создана!"
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "тип = %s"
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4114,57 +4142,57 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Невозможно присоединить том для копии %s"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Выполняет запуск %s копий..."
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Выполнение завершения работы копий"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Тип копии %(instance_type_id)s не найден."
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Выполнение завершения работы копий"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "Отсутствует узел для копии %s, немедленное удаление"
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Выполнение запуска копий"
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Будет выполнения попытка завершить работу %s"
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Попытка остановить %s"
@@ -4174,21 +4202,21 @@ msgstr "Попытка остановить %s"
 msgid "Going to try to start instance"
 msgstr "Попытка запустить %s"
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr "Поиск по: %s"
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Запуск снимка для ВМ %s"
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4197,63 +4225,63 @@ msgstr ""
 "Устаревший тип копии %(current_instance_type_name)s,  новый тип копии "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, 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:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Будет выполнения попытка завершить работу %s"
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Группа безопасности %s не может быть пустой."
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4262,70 +4290,70 @@ msgstr ""
 "Значение (%s) для параметра GroupName недопустимо. Длина превышает "
 "максимально допустимое значение 255."
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Создать группу безопасности %s"
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Группа безопасности %s уже существует"
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Невозможно ликвидировать vbd %s"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Невозможно ликвидировать vbd %s"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Группа безопасности (%s) не найдена"
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Правило (%s) не найдено"
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Добавление правила группы безопасности: %r"
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4384,297 +4412,292 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "Копия типа %s не найдена для выполнения удаления"
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Ошибка перезагрузки копии"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Драйвер гипервизора не поддерживает правила брандмауэра"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Ошибка приостановления копии"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Драйвер гипервизора не поддерживает правила брандмауэра"
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Непредвиденный код состояния"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Выполнение запуска копий"
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "установка сетевого узла"
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Выполнение запуска копий"
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Пропуск DiskNotFound: %s"
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Пропуск DiskNotFound: %s"
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr "завершение работы bdm %s"
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Установка состояния копии vm_state на ERROR"
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Обновление сборки %s"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s располагается на общедоступном накопителе: %(reason)s"
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Создать снимок из тома %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Перезагрузка копии %s"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4683,22 +4706,22 @@ msgstr ""
 "попытка перезагрузки не выполняемой копии: %(instance_uuid)s (состояние: "
 "%(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "Обновление сборки %s"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "копия не включена"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "копия %s: выполнение снимка"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4707,229 +4730,229 @@ msgstr ""
 "попытка создания снимка не выполняемой копии: %(instance_uuid)s "
 "(состояние: %(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Найдено %(num_images)d образов (ротация: %(rotation)d)"
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr "Удаление образа %s"
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 #, fuzzy
 msgid "Root password set"
 msgstr "Копия %s: Назначение административного пароля"
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "set_admin_password не реализован в этой драйвере."
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password не реализован в этой драйвере."
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Ошибка назначения пароля администратора"
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Ошибка приостановления копии"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "%s. Установка состояния копии vm_state на ERROR"
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Копия не существует"
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr "назначение совпадает с источником!"
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "копия %s: принятие диагностики"
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 #, fuzzy
 msgid "Reset network"
 msgstr "Восстановление сети"
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 #, fuzzy
 msgid "Inject network info"
 msgstr "установка сетевого узла"
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 #, fuzzy
 msgid "Get console output"
 msgstr "Получить консольный вывод для копии %s"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "копия %s: получение консоли vnc"
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 #, fuzzy
 msgid "Getting spice console"
 msgstr "копия %s: получение консоли vnc"
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Отсоединение тома от неизвестной копии %s"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Попытка удаления несуществующей консоли %(console_id)s."
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "сетевые распределения для копии %s"
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "Сеть %(network_id)s не найдена."
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "Узел %(host)s не найден."
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4938,21 +4961,21 @@ msgstr ""
 "отсутствует домен с соответствующим именем.\" Эта ошибка может быть "
 "безопасно пропущена."
 
-#: nova/compute/manager.py:3426
+#: nova/compute/manager.py:3458
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Ошибка получения метаданных для ip: %s"
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -4961,64 +4984,64 @@ msgstr ""
 "Найдены %(migration_count)d неподтверждённых перемещений, старше "
 "%(confirm_window)d секунд"
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "Завершение работы ВМ для копии %(instance_uuid)s"
 
-#: nova/compute/manager.py:3659
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "Копия %(instance_id)s не найдена"
+#: nova/compute/manager.py:3691
+#, python-format
+msgid "Instance %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr "Обновление временных данных использования полосы пропускания"
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Обновление временных данных использования полосы пропускания"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr "Обновление состояния узла"
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5027,88 +5050,86 @@ msgstr ""
 "Найдено %(num_db_instances)s в базе данных и %(num_vm_instances)s в "
 "гипервизоре."
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "копия не включена"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, пропуск..."
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, fuzzy, python-format
 msgid "No service record for host %s"
 msgstr "Нет службы для compute ID %s"
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
-#, fuzzy, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+#: nova/compute/manager.py:4169
+#, python-format
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
-"Не распознанное значение '%(action)s' для "
-"FLAGS.running_deleted_instance_action"
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "%s. Установка состояния копии vm_state на ERROR"
@@ -5210,11 +5231,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "Невозможно найти узел для копии %s"
@@ -5224,7 +5245,7 @@ msgstr "Невозможно найти узел для копии %s"
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5321,11 +5342,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Ошибка перезагрузки копии"
@@ -5344,44 +5365,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Нераспознанное значение read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "Недопустимый запрос тела"
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "Недопустимый запрос тела"
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "Недопустимый запрос тела"
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "Недопустимый запрос тела"
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "Недопустимый запрос тела"
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5398,57 +5419,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 #, fuzzy
 msgid "Unsupported id columns type"
 msgstr "Не поддерживаемый  тип содержимого"
@@ -5473,7 +5494,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, fuzzy, python-format
 msgid "fetching image %s from glance"
 msgstr "Удаление образа %s"
@@ -5644,23 +5665,23 @@ msgstr "Домен |%(domain)s| уже существует, изменение
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "Домен |%(domain)s| уже существует, изменение проекта на |%(project)s|."
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr "Этот драйвер поддерживает только записи типа 'a'."
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5687,111 +5708,111 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "Недопустимое состояние: '%s'"
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "Запуск интерфейса VLAN %s"
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "Запуск копии %s"
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "Интерфейс %(interface)s не найден"
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "Ошибка приостановления копии"
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Запуск копии %s"
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Ошибка запуска xvp: %s"
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr "установка сетевого узла"
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 #, fuzzy
 msgid "network allocations"
 msgstr "сетевые распределения для копии %s"
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, fuzzy, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 #, fuzzy
 msgid "network deallocation for instance"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5802,79 +5823,79 @@ msgstr ""
 "доступной зоне |%(zone)s|. Копия |%(instance)s| расположена в зоне "
 "|%(zone2)s|. Запись DNS не будет создана."
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, fuzzy, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr "Превышена квота для %s, попытка выделения адреса"
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 #, fuzzy
 msgid "Failed to update usages deallocating fixed IP"
 msgstr "Ошибка обновления тома в базе данных"
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Арендованный IP |%(address)s|"
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Присвоенный IP |%(address)s|"
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr "cidr уже используется"
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей супер-сетью "
 "(%(super)s)"
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -5883,22 +5904,22 @@ msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей, меньшей cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr "Сеть уже существует!"
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Сеть должна быть исключена из проекта %s перед удалением"
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -6031,7 +6052,7 @@ 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:262
+#: nova/network/security_group/quantum_driver.py:263
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Обнаружена ошибка: %s"
@@ -6046,48 +6067,48 @@ msgstr "Удалить группу безопасности %s"
 msgid "Security group id should be uuid"
 msgstr "Группа безопасности (%s) не найдена"
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Обнаружена ошибка: %s"
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Группа безопасности с правилом %(rule_id)s не найдена."
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, 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:446
+#: nova/network/security_group/quantum_driver.py:444
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6111,12 +6132,12 @@ msgstr "Ошибка назначения пароля администрато�
 msgid "Invalid version string"
 msgstr "Недопустимая server_string: %s"
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6832,7 +6853,7 @@ msgstr "Невозможно найти другой compute"
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: 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"
@@ -6950,7 +6971,7 @@ msgstr "Нет службы для compute ID %s"
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "Ошибка schedule_%(method)s: %(ex)s"
@@ -6989,7 +7010,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7247,7 +7268,7 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 #, fuzzy
 msgid ""
@@ -7255,65 +7276,65 @@ msgid ""
 "instances"
 msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr "Выполняемые копии: %s"
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "После завершения работы копий: %s"
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "После принудительного завершения работы копий: %s"
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 #, fuzzy
 msgid "spawn error"
 msgstr "Ошибка аутентификации"
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, fuzzy, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr "Адрес |%(address)s| не выделен"
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7323,22 +7344,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, fuzzy, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr "Адрес |%(address)s| не выделен"
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7408,36 +7429,36 @@ msgstr "Декодирование JSON: %s"
 msgid "fake vswitch not found"
 msgstr "маркер [%s] не найден"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Создание файлов в %s для имитации гостевого агента"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Удаление файлов имитации гостевого агента в %s"
@@ -7447,25 +7468,25 @@ msgstr "Удаление файлов имитации гостевого аге
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Невозможно загрузить драйвер виртуализации: %s"
@@ -7475,25 +7496,25 @@ msgstr "Невозможно загрузить драйвер виртуали�
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 #, fuzzy
 msgid "Filters added to instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr "Выполненое обновление правил брандмауэра поставщика"
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr "Добавление правила группы безопасности: %r"
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr "Добавление правила поставщика: %s"
@@ -8268,17 +8289,17 @@ msgstr "Версия агента копии: %s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 #, fuzzy
 msgid "get_host_stats called"
 msgstr "Получить консольный вывод для копии %s"
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, fuzzy, python-format
 msgid "Host IP address is: %s"
 msgstr "Присвоить адрес %s"
@@ -8630,12 +8651,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Перечень копий"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
@@ -8801,7 +8822,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr "Создание снимка копии ВМ %s "
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8820,256 +8841,266 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, fuzzy, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr "Ошибка поиска vbd для vdi %s"
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "том группы %s не существует"
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr "Неполадка с подключением к libvirt"
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Выполнение остановки копий"
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Ошибка schedule_%(method)s: %(ex)s"
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Сети не определены."
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Сети не определены."
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "снимок %s: создание завершено"
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Пользователь не имеет административных привилегий"
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr "Создание изображения"
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Запрос xapi на приём образа vhd %(image)s"
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9077,12 +9108,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9091,27 +9129,32 @@ msgstr ""
 "Ошибка libvirt во время поиска %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9120,35 +9163,25 @@ msgstr ""
 "Невозможно получить количество ЦПУ, так как эта возможность не "
 "реализована для этой платформы. Эту ошибку можно безопасно пропустить."
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "устаревшая версия libvirt (не поддерживается getVersion)"
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Получение размера образа для образа %s"
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9156,21 +9189,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9179,29 +9212,29 @@ msgstr ""
 "Создание временного файла %s для оповещения других узлов сети compute о "
 "необходимости присоединения того же хранилища."
 
-#: nova/virt/libvirt/driver.py:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9211,7 +9244,7 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9220,22 +9253,22 @@ msgstr ""
 "Создание временного файла %s для оповещения других узлов сети compute о "
 "необходимости присоединения того же хранилища."
 
-#: nova/virt/libvirt/driver.py:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Ошибка аутентификации: %s"
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, 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:3447
+#: nova/virt/libvirt/driver.py:3500
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9244,39 +9277,39 @@ msgstr ""
 "Ошибка libvirt во время поиска %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Копия %s: выполнение"
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9289,25 +9322,25 @@ msgstr ""
 "Модуль Libvirt не может быть загружен. NWFilterFirewall не будет работать"
 " надлежащим образом."
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, 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:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "Брандмауэр iptables: Настройка базовой фильтрации"
 
@@ -9494,7 +9527,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9532,14 +9565,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr "Ошибка отсоединения vif копии '%s'"
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9547,7 +9580,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9555,7 +9588,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9563,7 +9596,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9571,12 +9604,12 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "iSCSI-устройство не найдено в %s"
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, fuzzy, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
@@ -9585,48 +9618,48 @@ msgstr ""
 "Том ISCSI не найден в: %(mount_device)s. Будет выполнена повторная "
 "проверка и попытка.  Повторение: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, fuzzy, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr "Найден узел iSCSI %(mount_device)s (после %(tries)s повторных проверок)"
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "образ уже присоединён"
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "iSCSI-устройство не найдено в %s"
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, fuzzy, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 "Том ISCSI не найден в: %(mount_device)s. Будет выполнена повторная "
 "проверка и попытка.  Повторение: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, fuzzy, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr "Найден узел iSCSI %(mount_device)s (после %(tries)s повторных проверок)"
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 #, fuzzy
 msgid "Fibre Channel device not found."
 msgstr "iSCSI-устройство не найдено в %s"
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, fuzzy, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
@@ -9635,30 +9668,30 @@ msgstr ""
 "Том ISCSI не найден в: %(mount_device)s. Будет выполнена повторная "
 "проверка и попытка.  Повторение: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, fuzzy, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr "Найден узел iSCSI %(mount_device)s (после %(tries)s повторных проверок)"
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9765,26 +9798,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr "Сбой соединения c melange"
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9934,32 +9967,32 @@ msgstr ""
 "Необходимо указать vmwareapi_host_ip,vmwareapi_host_username и "
 "vmwareapi_host_password useconnection_type=vmwareapi"
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "маркер [%s] не найден"
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "В vmwareapi:_create_session, принято это исключение: %s"
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "В vmwareapi:_call_method, принято это исключение: %s"
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "Состояние задачи [%(task_name)s] %(task_ref)s: готово"
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, 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:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "В vmwareapi:_poll_task, принята эта ошибка %s"
@@ -9969,39 +10002,39 @@ msgstr "В vmwareapi:_poll_task, принята эта ошибка %s"
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, 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:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr "Отсутствуют зарегистрированные ВМ"
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "Завершение сеанса с неполадками или уже завершённого сеанса: %s"
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr "Сеанс имеет неполадки"
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr "Недопустимый сеанс"
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " Отсутствуют зарегистриованные виртуальные машины"
@@ -10011,17 +10044,17 @@ msgstr " Отсутствуют зарегистриованные виртуа�
 msgid "%(action)s %(host)s"
 msgstr "действие: %s"
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, fuzzy, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr "Перевод узла %(host)s в %(state)s."
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -10042,7 +10075,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -10085,59 +10118,59 @@ msgstr "Перечень копий"
 msgid "Got total of %s instances"
 msgstr "Всего %s копий"
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 #, fuzzy
 msgid "Creating VM on the ESX host"
 msgstr "Создание ВМ с именем %s на узле ESX"
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 #, fuzzy
 msgid "Created VM on the ESX host"
 msgstr "Создание ВМ с именем %s на узле ESX"
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -10145,334 +10178,333 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 #, fuzzy
 msgid "Powering on the VM instance"
 msgstr "Включение питания на копии ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 #, fuzzy
 msgid "Powered on the VM instance"
 msgstr "Питание включено на копии ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 #, fuzzy
 msgid "Creating Snapshot of the VM instance"
 msgstr "Создание снимка копии ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 #, fuzzy
 msgid "Created Snapshot of the VM instance"
 msgstr "Создание снимка копии ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr "Выгрузка образа %s"
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr "Выгруженный образ %s"
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr "Удаление временного файла vmdk %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr "Удалённый временный файл vmdk %s"
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr "копия не включена"
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 #, fuzzy
 msgid "Rebooting guest OS of VM"
 msgstr "Перезагрузка гостевой ОС ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 #, fuzzy
 msgid "Rebooted guest OS of VM"
 msgstr "Выполнена перезагрузка гостевой ОС ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 #, fuzzy
 msgid "Doing hard reboot of VM"
 msgstr "Выполнение безотказной перезагрузки ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 #, fuzzy
 msgid "Did hard reboot of VM"
 msgstr "Выполнение безотказной перезагрузки ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-#, fuzzy
-msgid "instance not present"
-msgstr "копия - %s не представлена"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Незарегистрированная ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, fuzzy, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr "В vmwareapi:_call_method, принято это исключение: %s"
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 #, fuzzy
 msgid "Powering off the VM"
 msgstr "Выключение питания ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 #, fuzzy
 msgid "Powered off the VM"
 msgstr "Питание ВМ %s выключено"
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 #, fuzzy
 msgid "Unregistering the VM"
 msgstr "Исключение регистрации ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 #, fuzzy
 msgid "Unregistered the VM"
 msgstr "Незарегистрированная ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 #, fuzzy
 msgid "Suspending the VM"
 msgstr "Приостановка ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 #, fuzzy
 msgid "Suspended the VM"
 msgstr "Приостановленная ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 #, fuzzy
 msgid "instance is powered off and cannot be suspended."
 msgstr "Питание копии выключено и следовательно она не может быть приостановлена."
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 #, fuzzy
 msgid "Resuming the VM"
 msgstr "Возобновление работы ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 #, fuzzy
 msgid "Resumed the VM"
 msgstr "Работа ВМ %s возобновлена "
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr "копия не в приостановленном состоянии"
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 #, fuzzy
 msgid "instance is suspended and cannot be powered off."
 msgstr "копия не включена"
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 #, fuzzy
 msgid "Powering on the VM"
 msgstr "Выключение питания ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 #, fuzzy
 msgid "Powered on the VM"
 msgstr "Питание ВМ %s выключено"
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Обновление выполнения копии '%(instance_uuid)s' до %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Удалить том с идентификатором: %s"
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+#, fuzzy
+msgid "instance not present"
+msgstr "копия - %s не представлена"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, 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:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Удалить том с идентификатором: %s"
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Создать том из снимка %s"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "Автоматическая безотказная перезагрузка %d"
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "Создание папки с адресом %s"
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr "Создана папка с адресом %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr "Получение размера образа для образа %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "Принят размер образа %(size)s для образа %(image)s"
@@ -10535,7 +10567,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10545,12 +10577,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "Невозможно найти адрес %r"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Точка подключения %(mountpoint)s присоединена к копии %(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10560,19 +10592,19 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr "Ошибка поиска тома в базе данных"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10581,101 +10613,94 @@ msgstr ""
 "НЕ РЕАЛИЗОВАНО: Вызов %(method)s не поддерживается агентом. VM "
 "id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
-#, fuzzy, python-format
+#: nova/virt/xenapi/agent.py:123
+#, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
-"Вызов агентом %(method)s возвратил недопустимый ответ: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
-msgstr "Ошибка запроса версии агента: %(resp)r"
+msgid "Failed to query agent version: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr "Запрос версии агента"
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Обновление агента до %s"
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
-msgstr "Ошибка обновления агента: %(resp)r"
+msgid "Failed to update agent: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr "Настройка пароля администратора"
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
-msgstr "Ошибка обмена ключей: %(resp)r"
-
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr "Ошибка обновления пароля: %(resp)r"
+msgid "Failed to exchange keys: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr "Восстановление сети"
 
-#: nova/virt/xenapi/agent.py:286
-#, fuzzy, python-format
-msgid "Failed to reset network: %(resp)r"
-msgstr "Ошибка обновления пароля: %(resp)r"
+#: nova/virt/xenapi/agent.py:290
+#, python-format
+msgid "Failed to reset network: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr "Средства XenServer не установлены в этот образ"
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Ошибка OpenSSL: %s"
@@ -10695,56 +10720,56 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Ошибка дешифрирования личного ключа: %s"
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr "Запуск узла на XenServer не поддерживается."
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 "Невозможно выполнить вход в XenAPI (недостаточно свободного места на "
 "Dom0?)"
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr "Исключение: %s"
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake не имеет реализации для %s"
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
-msgstr "Выполняется вызов %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr "Выполняется вызов getter %s"
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Выполняется вызов getter %s"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10753,21 +10778,21 @@ msgstr ""
 "xenapi.fake не имеет реализации для %s или был вызван с использованием "
 "неправильным числом аргументов"
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, fuzzy, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr "Узел сompute %(host)s не найден."
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10800,7 +10825,7 @@ msgstr "Найдена не уникальная сеть для моста %s"
 msgid "Found no network for bridge %s"
 msgstr "Не найдена сеть для моста %s"
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10809,37 +10834,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
-#, fuzzy, python-format
-msgid "Unable to join %(host)s in the pool"
-msgstr "Невозможно найти узел для копии %s"
+#, python-format
+msgid "Unable to join %s in the pool"
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "Невозможно использовать глобальные полномочия %(role_id)s"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10850,7 +10875,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10890,37 +10915,37 @@ msgstr "группа %s уже существует"
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Невозможно отсоединить VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Невозможно ликвидировать VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Создана VBD %(vbd_ref)s для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Создана VBD %(vbd_ref)s для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "Невозможно ликвидировать VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10929,100 +10954,114 @@ msgstr ""
 "Создан VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
 "на %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "Копия не найдена"
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, fuzzy, python-format
 msgid "block device info: %s"
 msgstr "block_device_list %s"
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
-#, fuzzy, python-format
-msgid "No primary VDI found for %(vm_ref)s"
-msgstr "Отсутствует первичный VDI для%(vm_ref)s"
+#: nova/virt/xenapi/vm_utils.py:645
+#, python-format
+msgid "No primary VDI found for %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Запуск снимка для ВМ %s"
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, fuzzy, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 "xapi 'download_vhd' возвратил VDI типа '%(vdi_type)s' с UUID "
 "'%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
-#, fuzzy, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
-msgstr "Запрос xapi на приём образа vhd %(image)s"
+#: nova/virt/xenapi/vm_utils.py:1135
+#, python-format
+msgid "Asking xapi to fetch vhd image %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, fuzzy, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 "Размер образа %(size_bytes)d превышает допустимый instance_type  размер "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Ядро не найдено для образа %(image_id)s."
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -11031,204 +11070,204 @@ msgstr ""
 "Превышен размер ядра/Ramdisk образа: %(vdi_size)d байт, макс. "
 "%(max_size)d байт"
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Копирование VDI %s в /boot/guest на dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Ядро/Ramdisk VDI %s ликвидирован"
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "Обнаружен %(image_type_str)s формат для образа %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Поиск vdi %s для ядра PV"
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
-msgstr "Неизвестный формат образа %(disk_image_type)s"
+msgid "Unknown image format %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s до сих пор доступен"
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Повторная проверка SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr "Невозможно найти SR типа содержимого ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
-msgstr "ISO: поиск SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr "ISO: не содержимое iso типа"
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR с локальной PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Время ожидания при создании устройства %s"
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Подсоединение VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Подсоединение VBD %s выполнено."
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s подсоединено как %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 "VBD %(vbd_ref)s подсоединено в неправильный dev, изменение назначения на "
 "%(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Ликвидирование VBD для VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Ликвидирование VBD для VDI %s завершено."
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Найдено ядро Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Ядро Xen не найдено.  Загрузка HVM."
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11236,16 +11275,16 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr "Разделы:"
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d секторов"
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -11254,160 +11293,155 @@ msgstr ""
 "Запись таблицы разделов %(primary_first)d %(primary_last)d в "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Запись таблицы разделов %s выполнена."
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 "Ошибка присоединения файловой системы (ожидаемо для копий не на базе "
 "linux): %s"
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
-#, fuzzy, python-format
-msgid "Updating progress to %(progress)d"
-msgstr "Обновление выполнения копии '%(instance_uuid)s' до %(progress)d"
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
+#, python-format
+msgid "Updating progress to %d"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, fuzzy, python-format
 msgid "Importing image upload handler: %s"
 msgstr "Запуск моста интерфейса для %s"
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 #, fuzzy
 msgid "Starting instance"
 msgstr "Запуск копии %s"
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "Удаление ядра/ramdisk файлов из dom0"
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, fuzzy, python-format
 msgid "Block device information present: %s"
 msgstr "block_device_mapping %s"
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Ошибка обновления тома в базе данных"
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 #, fuzzy
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 "Автоматическая настройка диска для копии %(instance_uuid)s, выполняется "
 "попытка изменения размера раздела..."
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 #, fuzzy
 msgid "Starting VM"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "Версия агента копии: %s"
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, fuzzy, python-format
 msgid "Could not find VM with name %s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Готовый снимок и выгрузка для ВМ %s"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr "Ошибка перемещения vhd на новый узел"
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Изменение размера VDI %(vdi_uuid)s с %(old_gb)dГБ до %(new_gb)dГБ"
@@ -11417,127 +11451,125 @@ msgstr "Изменение размера VDI %(vdi_uuid)s с %(old_gb)dГБ д�
 msgid "Resize complete"
 msgstr "Изменение размера копии %s завершено"
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 #, fuzzy
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "Ошибка поиска vbd для vdi %s"
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 #, fuzzy
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 "Копия %(instance_uuid)s использует RAW или VHD, пропуск ядра и удаление "
 "ramdisk"
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "копия содержит ядро или ramdisk, но не оба"
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr "файлы ядра/ramdisk удалены"
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr "ВМ не предоставлена, пропуск выполнения ликвидации..."
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "Копия в состоянии режима восстановления: %s"
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 #, fuzzy
 msgid "VM is not present, skipping soft delete..."
 msgstr "ВМ не предоставлена, пропуск выполнения ликвидации..."
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 #, fuzzy
 msgid "Automatically hard rebooting"
 msgstr "Автоматическая безотказная перезагрузка %d"
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "установка сетевого узла"
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 #, fuzzy
 msgid "Creating vifs"
 msgstr "Создание изображения"
 
-#: nova/virt/xenapi/vmops.py:1549
-#, fuzzy, python-format
-msgid "Creating VIF for network %(network_ref)s"
-msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
+#: nova/virt/xenapi/vmops.py:1571
+#, python-format
+msgid "Creating VIF for network %s"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "Недопустимый сетевой формат"
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 #, fuzzy
 msgid "Migrate Send failed"
 msgstr "Ошибка создания"
 
 #: nova/virt/xenapi/volume_utils.py:51
-#, fuzzy, python-format
-msgid "Creating SR %(label)s"
-msgstr "Создание SR %s"
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
-#, fuzzy, python-format
-msgid "Introducing SR %(label)s"
-msgstr "Внедрение SR %s"
+#, python-format
+msgid "Introducing SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
 #, fuzzy
@@ -11587,25 +11619,25 @@ msgstr "Невозможно внедрить VDI для SR %s"
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
-#, fuzzy, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
-msgstr "Невозможно получить сведения назначения %(data)s, %(mountpoint)s"
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
+#, python-format
+msgid "Unable to obtain target information %s"
+msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
-#, fuzzy, python-format
-msgid "Unable to obtain target information %(connection_data)s"
-msgstr "Невозможно получить сведения назначения %(data)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:47
+#, python-format
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "Подключить том %(volume_id)s для копии %(instance_id)s на %(device)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
-#, fuzzy, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
-msgstr "Копия %(instance_id)s не найдена."
+#: nova/virt/xenapi/volumeops.py:143
+#, python-format
+msgid "Skipping detach because VBD for %s was not found"
+msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
 #, python-format
@@ -11615,7 +11647,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11670,8 +11702,217 @@ msgstr "Образ должен быть доступен"
 msgid "status must be 'available'"
 msgstr "Образ должен быть доступен"
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr "Неизвестная цепочка: %r"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr "Недопустимый тип копии %(instance_type)s."
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "Обновление сборки %s"
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "Сеть %(network_id)s не найдена."
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "Узел %(host)s не найден."
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr "Копия %(instance_id)s не найдена"
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+#~ "Не распознанное значение '%(action)s' для "
+#~ "FLAGS.running_deleted_instance_action"
+
+#~ msgid "List of domains returned by libVirt: %s"
 #~ msgstr ""
 
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+#~ "Вызов агентом %(method)s возвратил "
+#~ "недопустимый ответ: %(ret)r. VM "
+#~ "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr "Ошибка запроса версии агента: %(resp)r"
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr "Ошибка обновления агента: %(resp)r"
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr "Ошибка обмена ключей: %(resp)r"
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr "Ошибка обновления пароля: %(resp)r"
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr "Ошибка обновления пароля: %(resp)r"
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr "Выполняется вызов %(localname)s %(impl)s"
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr "Невозможно найти узел для копии %s"
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "Невозможно использовать глобальные полномочия %(role_id)s"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr "Отсутствует первичный VDI для%(vm_ref)s"
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr "Запрос xapi на приём образа vhd %(image)s"
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr "Неизвестный формат образа %(disk_image_type)s"
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr "ISO: поиск SR %(sr_rec)s"
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr "Обновление выполнения копии '%(instance_uuid)s' до %(progress)d"
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr "Создание SR %s"
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr "Внедрение SR %s"
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr "Невозможно получить сведения назначения %(data)s, %(mountpoint)s"
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr "Невозможно получить сведения назначения %(data)s, %(mountpoint)s"
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "Подключить том %(volume_id)s для копии %(instance_id)s на %(device)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
+#~ msgstr "Копия %(instance_id)s не найдена."
+
diff --git a/nova/locale/ru_RU/LC_MESSAGES/nova.po b/nova/locale/ru_RU/LC_MESSAGES/nova.po
index a0a868446..21cb81823 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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) "
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -179,7 +179,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1020,337 +1020,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1373,7 +1378,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1410,31 +1415,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1448,62 +1453,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1584,124 +1589,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1711,261 +1716,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2755,7 +2760,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3068,7 +3073,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3096,34 +3101,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3258,18 +3263,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3307,23 +3329,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3559,30 +3589,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3592,35 +3622,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3641,312 +3671,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3999,52 +4029,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4052,152 +4082,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4255,690 +4285,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5038,11 +5063,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5052,7 +5077,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5145,11 +5170,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5167,44 +5192,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5221,57 +5246,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5295,7 +5320,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5465,23 +5490,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5506,109 +5531,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5616,98 +5641,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5835,7 +5860,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5848,45 +5873,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5907,12 +5932,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6610,7 +6635,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6728,7 +6753,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6767,7 +6792,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7024,71 +7049,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7098,22 +7123,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7179,36 +7204,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7218,25 +7243,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7245,24 +7270,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8030,16 +8055,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8382,12 +8407,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8545,7 +8570,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8564,250 +8589,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8815,73 +8850,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8889,50 +8926,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8942,67 +8979,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9013,25 +9050,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9218,7 +9255,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9255,14 +9292,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9270,7 +9307,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9278,7 +9315,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9286,7 +9323,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9294,87 +9331,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9478,26 +9515,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9643,32 +9680,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9678,39 +9715,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9719,17 +9756,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9750,7 +9787,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9793,57 +9830,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9851,311 +9888,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10218,7 +10254,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10227,12 +10263,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10241,116 +10277,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10366,75 +10397,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10466,7 +10497,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10475,37 +10506,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10516,7 +10547,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10555,332 +10586,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10888,166 +10933,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11056,114 +11096,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11212,24 +11250,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11240,7 +11278,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11293,8 +11331,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/sw_KE/LC_MESSAGES/nova.po b/nova/locale/sw_KE/LC_MESSAGES/nova.po
index 2efdbc73a..6bfcfb432 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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) "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index 53e2053f7..dee344927 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -177,7 +177,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1018,337 +1018,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1371,7 +1376,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1408,31 +1413,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1446,62 +1451,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1582,124 +1587,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1709,261 +1714,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2753,7 +2758,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3066,7 +3071,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3094,34 +3099,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3256,18 +3261,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3305,23 +3327,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3557,30 +3587,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3590,35 +3620,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3639,313 +3669,313 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "natanggap %s"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index 9178842e9..e78cc1798 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -177,7 +177,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1018,337 +1018,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1371,7 +1376,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1408,31 +1413,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1446,62 +1451,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1582,124 +1587,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1709,261 +1714,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2753,7 +2758,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3066,7 +3071,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3094,34 +3099,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3256,18 +3261,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3305,23 +3327,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3557,30 +3587,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3590,35 +3620,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3639,312 +3669,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3997,52 +4027,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4050,152 +4080,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4253,690 +4283,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5036,11 +5061,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5050,7 +5075,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5143,11 +5168,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5165,44 +5190,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5219,57 +5244,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5293,7 +5318,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5463,23 +5488,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5504,109 +5529,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5614,98 +5639,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5833,7 +5858,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5846,45 +5871,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5905,12 +5930,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6608,7 +6633,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6726,7 +6751,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6765,7 +6790,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7022,71 +7047,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7096,22 +7121,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7177,36 +7202,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7216,25 +7241,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7243,24 +7268,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8028,16 +8053,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8380,12 +8405,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8543,7 +8568,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8562,250 +8587,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8813,73 +8848,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8887,50 +8924,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8940,67 +8977,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9011,25 +9048,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9216,7 +9253,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9253,14 +9290,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9268,7 +9305,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9276,7 +9313,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9284,7 +9321,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9292,87 +9329,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9476,26 +9513,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9641,32 +9678,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9676,39 +9713,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9717,17 +9754,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9748,7 +9785,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9791,57 +9828,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9849,311 +9886,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10216,7 +10252,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10225,12 +10261,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10239,116 +10275,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10364,75 +10395,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10464,7 +10495,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10473,37 +10504,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10514,7 +10545,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10553,332 +10584,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10886,166 +10931,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11054,114 +11094,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11210,24 +11248,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11238,7 +11276,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11291,8 +11329,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova.po b/nova/locale/tr_TR/LC_MESSAGES/nova.po
index 930e2b3a9..2288e0d6d 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -179,7 +179,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr "Anahtar çifti verisi geçersiz"
 
@@ -1047,339 +1047,344 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:972
 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:972
+#: nova/exception.py:976
 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:976
+#: nova/exception.py:980
 #, 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:980
+#: nova/exception.py:984
 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:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Geçerli bir sunucu bulunamadı: %(reason)s"
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr "Kota aşıldı"
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr "Kişisel dosya limiti aşıldı"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr "Kişisel dosya yolu çok uzun"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr "Kişisel dosya içeriği çok uzun"
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "%(aggregate_id)s kümesi bulunamadı."
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "%(aggregate_name)s kümesi zaten var."
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, 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:1049
+#: nova/exception.py:1053
 #, 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:1054
+#: nova/exception.py:1058
 #, 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:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr "Örnek tür oluşturulamıyor."
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "%(instance_id)s örneği bulunamadı."
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, 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:1086
+#: nova/exception.py:1090
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "%(volume_id)s bölümü bulunamadı."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "%(project_id)s projesi bulunamadı."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, 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:1160
+#: nova/exception.py:1164
 #, 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:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, 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:1209
+#: nova/exception.py:1213
 #, 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:1214
+#: nova/exception.py:1218
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "%(name)s örneği zaten var."
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Beklenen nesne türü: %s"
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1402,7 +1407,7 @@ msgstr "Yetenekler zamanlayıcısı bildiriliyor ..."
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
@@ -1440,31 +1445,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "%s servisi için tüketici bağlantısı oluşturuluyor."
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "Servis, hiç veritabanı girdisi olmayanı sonlandırdı."
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1478,62 +1483,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Yerel adres bağlantısı bulunamadı.:%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Geçersiz backend: %s"
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, fuzzy, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr "Bilinmeyen temel dosya: %s"
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Beklenen nesne türü: %s"
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Geçersiz server_string: %s"
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "Zaman Fonksiyonu: %(name)s %(total_time).2f saniye sürdü"
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "%s güvenlik grubu string veya unicode değil"
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1614,11 +1619,11 @@ msgstr "%(code)s: %(message)s"
 msgid "FaultWrapper: %s"
 msgstr "Hata yakalayıcı: %s"
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr "Çok sayıda kimlik doğrulama başarısız oldu."
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1627,114 +1632,114 @@ msgstr ""
 "%(access_key)s erişim anahtarı %(failures)d kez yanlış girildi ve "
 "%(lock_mins)d dakika boyunca kilitlenmiş olacak."
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr "İmza verilmedi."
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr "Erişim anahtarı verilmedi."
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "Temel dosya kaldırılıyor: %s"
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Çok sayıda kimlik doğrulama başarısız oldu."
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr "işlem: %s"
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s»»val: %(value)s"
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "%(controller)s kontrolcüsü ve %(action)s işlemi için izinsiz istek"
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "ÖrnekBulunamadı hatası: %s"
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "BölümBulunamadı hatası: %s"
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "SistemAnlıkGörüntüsüBulunamadı hatası: %s"
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "Bulunamadı hatası: %s"
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "AnahtarÇiftiZatenVar hatası: %s"
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, fuzzy, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr "Geçersizİstek hatası: %s"
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "GeçersizParametreDeğeri hatası: %s"
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "GeçersizPortGenişliği hatası: %s"
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "KimlikDoğrulama hatası: %s"
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "Geçersizİstek hatası: %s"
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "BeklenmeyenHata: %s"
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr "Ortam: %s"
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen tekrar deneyin."
@@ -1744,261 +1749,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:391
+#: nova/api/ec2/cloud.py:402
 #, 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:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr "%s anahtar çiftini oluştur"
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr "%s anahtarını içeriye aktar"
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr "%s anahtar çiftini sil"
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Geçersiz IP %(protocol)s."
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr "Belirlenmiş parametreler için hiç kural yok"
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, 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:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "%s sistem görüntüsünden birim oluştur"
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 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:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, 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:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Birimi ayır %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "Özellik desteklenmiyor: %s"
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr "birim = %s\n"
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "Adres tahsisi"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "%s adresini serbest bırak"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, 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:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Adresi kes %s"
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr "İmaj müsait olmak zorunda"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr "%r örneğini tekrar yükle"
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr "Örnekler durdurulacak"
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr "Örnekler başlatılacak"
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr "%s imaj kaydı siliniyor"
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, 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:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr "Kullanıcı veya grup belirlenmedi"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "Sadece \"all\" grubu destekleniyor"
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr "İşlem türü eklenmek veya kaldırılmak zorunda"
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "%s imaj tanıtımı güncelleniyor"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "%d saniye içinde örnek durdurulamadı"
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2803,7 +2808,7 @@ msgstr "yedekOluşturma 'dönüşme' özelliği tamsayı olmak zorunda"
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr "Örnek bulunamadı"
 
@@ -3128,7 +3133,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "%(address)s değişken IP adresi ilişkilendirilemedi."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3157,34 +3162,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Sunucu durumu güncelleniyor"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3322,19 +3327,36 @@ msgstr ""
 msgid "Create networks failed"
 msgstr "Tanımlı bir ağ yok."
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
-#, fuzzy, python-format
-msgid "Quota for %s should be integer."
-msgstr "Sürüm tam sayı olmak zorunda"
+#: nova/api/openstack/compute/contrib/quotas.py:152
+#, python-format
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
+msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
 msgid "Malformed scheduler_hints attribute"
@@ -3373,25 +3395,32 @@ msgstr "Güvenlik grubu belirlenmedi"
 msgid "Security group name cannot be empty"
 msgstr "Güvenlik grup adı boş bırakılamaz"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "Tanınmayan zincir: %r"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 #, fuzzy
 msgid "Unknown service"
 msgstr "Kimlik doğrulama hatası"
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3628,30 +3657,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3661,35 +3690,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "eleman çocuk değil"
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3710,323 +3739,323 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 #, fuzzy
 msgid "IP address"
 msgstr "Başlangıç adresi"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Hiç dinamik IP bulunamadı."
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "Örnekle değişken IP ilişkilendirilmedi"
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "Başlangıç adresi"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "proje"
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 #, fuzzy
 msgid "No networks found"
 msgstr "Ağ bulunamadı"
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "Ağ oluşturulurken %(req)s gereklidir."
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "%r örneğini tekrar yükle"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "%(service_id)s servisi bulunamadı."
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "%(service_id)s servisi bulunamadı."
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "BeklenmeyenHata: %s"
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 #, fuzzy
 msgid "PROJECT"
 msgstr "proje"
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 #, fuzzy
 msgid "Must supply valid parameters to create instance_type"
 msgstr "Örnek tür oluşturulamıyor."
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "Örnek mevcut değil"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 #, fuzzy
 msgid "Unknown error"
 msgstr "Kimlik doğrulama hatası"
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 #, fuzzy
 msgid "Valid instance type name is required"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4079,54 +4108,54 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, 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:1257
+#: nova/compute/api.py:1258
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4134,21 +4163,21 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4157,131 +4186,131 @@ msgstr ""
 "Eski örnek türü %(current_instance_type_name)s, yeni örnek türü "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, 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:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "%s güvenlik grubu boş bırakılamaz."
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, 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:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr "%s güvenlik grubunu oluşturunuz"
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr "%s güvenlik grubu zaten var"
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Geçersiz güncelleme ayarı: '%s'"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Kural (%s) bulunamadı"
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Yetkilendirilmiş %s güvenlik grubu girişi"
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "%s güvenlik grubu girişini iptal et"
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr "Güvenlik grup id'si integer olmak zorunda"
 
@@ -4339,614 +4368,609 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: 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"
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "Silme işlemi için %s örnek türü bulunamadı"
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, 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:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 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:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "BeklenmeyenHata: %s"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr "Durum kontrol ediliyor"
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "%s blok aygıt haritalandırması ayarlanıyor"
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Örnek oluşturmada hata"
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr "Örnek başlatılıyor.."
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr "Ağ kurulumundaki örnek başarısız"
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Örnek ağ_bilgisi: |%s|"
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr "Örnek blok aygıtı kurulumu hatalı"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr "Örnek oluşturmada hata"
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr "Örnek için ağ serbest bırakılıyor"
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Örnek için ağ serbest bırakılıyor"
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s örneği"
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "DiskBulunamadı yok sayılıyor: %s"
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr "Blok cihazı haritalandırması kapatılıyor %s"
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Birimi ayır %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, 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:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr "İmaj siliniyor %s"
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, 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:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Örneğin hiç bölümü yok."
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr "dedef kaynak ile aynı!"
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Konsol ekleniyor"
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, 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:3009
+#: nova/compute/manager.py:3036
 #, 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:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, 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:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, 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:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "%(volume_id)s bölümü hiçbir şeyle ilişkilendirilmedi"
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "%(host)s sunucusu bulunamadı."
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
-msgstr "Güncel göç işlemi %(dest)s'da bir hata ile karşılaştı"
+msgid "Pre live migration failed at %s"
+msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
-msgstr "%(dest)s'a örnek göçü işlemi başarıyla tamamlandı."
+msgid "Migrating instance to %s finished successfully."
+msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr "Bant genişliği kullanım önbelleği güncelleniyor"
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Bant genişliği kullanım önbelleği güncelleniyor"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr "Sunucu durumu güncelleniyor"
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -4955,84 +4979,84 @@ msgstr ""
 "Veritabanında %(num_db_instances)s ve misafir sistemde "
 "%(num_vm_instances)s bulundu"
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr "Silinen örnek kurtarılıyor"
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "İmaj siliniyor %s"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5133,11 +5157,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "%s örneği için sunucu bulma başarısız"
@@ -5147,7 +5171,7 @@ msgstr "%s örneği için sunucu bulma başarısız"
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5242,11 +5266,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
@@ -5265,44 +5289,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Tanınmayan silinmiş okuma değeri '%s'"
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5319,57 +5343,57 @@ msgstr "Sürüm tam sayı olmak zorunda"
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 #, fuzzy
 msgid "Unsupported id columns type"
 msgstr "Desteklenmeyen içerik türü"
@@ -5394,7 +5418,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, fuzzy, python-format
 msgid "fetching image %s from glance"
 msgstr "İmaj siliniyor %s"
@@ -5565,23 +5589,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr "Bu türücü sadece 'a' türü girdileri destekliyor."
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5606,109 +5630,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "%d süreç numarası bozuldu, radvd tekrar başlatılıyor"
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "%s VLAN arayüzü başlatılıyor "
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "%s köprüsü koruma altına alınıyor"
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "%(vlan)s vlan ve %(bridge)s köprüsü koruma altına alınıyor"
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5716,98 +5740,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5938,7 +5962,7 @@ 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:262
+#: nova/network/security_group/quantum_driver.py:263
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Yakalama hatası: %s"
@@ -5953,48 +5977,48 @@ msgstr "%s güvenlik grubunu siliniz"
 msgid "Security group id should be uuid"
 msgstr "Güvenlik grup id'si integer olmak zorunda"
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Yakalama hatası: %s"
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, 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:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, 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:446
+#: nova/network/security_group/quantum_driver.py:444
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6018,12 +6042,12 @@ msgstr "XVP başlatılırken hata oluştu: %s"
 msgid "Invalid version string"
 msgstr "Geçersiz server_string: %s"
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6722,7 +6746,7 @@ msgstr "Başka bir işlem bulunamadı"
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6840,7 +6864,7 @@ msgstr "%s işlem ID'si için servis yok"
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "%(method)s zamanlaması başarısız: %(ex)s"
@@ -6879,7 +6903,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7139,72 +7163,72 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr "Örnekler çalışıyor: %s"
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Örnekleri sonlandırmanın ardından: %s"
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr "İçsel hata"
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "Zorla öldürülen örneklerin ardından: %s"
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 #, fuzzy
 msgid "spawn error"
 msgstr "Kimlik doğrulama hatası"
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7214,22 +7238,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7299,36 +7323,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr " [%s] göstergesi bulunamadı"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr "Lütfen sahte libvirt modülü desteklenen bayraklar için genişletiniz"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, 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:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "%s'deki benzetilmiş konuk aracı dosyaları kaldırılıyor"
@@ -7338,25 +7362,25 @@ msgstr "%s'deki benzetilmiş konuk aracı dosyaları kaldırılıyor"
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Sanallaştırma sürücüsü yükleme başarısız: %s"
@@ -7366,24 +7390,24 @@ 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:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8156,16 +8180,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, fuzzy, python-format
 msgid "Host IP address is: %s"
 msgstr "%s adresini serbest bırak"
@@ -8510,12 +8534,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:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8674,7 +8698,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8693,253 +8717,263 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Örnekler durdurulacak"
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Tanımlı bir ağ yok."
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Tanımlı bir ağ yok."
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8947,73 +8981,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9021,21 +9057,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9044,29 +9080,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:3006
+#: nova/virt/libvirt/driver.py:3057
 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:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9081,7 +9117,7 @@ msgstr ""
 " \n"
 " Bkz: %(u)s"
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9090,62 +9126,62 @@ 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, 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:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "Birim gibi göründüğünden beri %(path)s atlanıyor"
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9156,25 +9192,25 @@ msgid ""
 "correctly."
 msgstr "Libvirt modülü yüklenemedi. Ağ filtre güvenlik duvarı doğru çalışmıyor."
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr "Ağ filtresinde temel filtreleme kurulumu çağırıldı"
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr "Durağan filtreler koruma altına alındı"
 
-#: nova/virt/libvirt/firewall.py:247
+#: 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ı."
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, 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:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptabloları güvenlik duvarı: Temel Filtreleme Kurulumu"
 
@@ -9363,7 +9399,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9400,14 +9436,14 @@ msgstr "%s köprüsü koruma altına alınıyor"
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9415,7 +9451,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9423,7 +9459,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9431,7 +9467,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9439,88 +9475,88 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "%s'de iSCSI cihazı bulunamadı"
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "%s'de iSCSI cihazı bulunamadı"
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 #, fuzzy
 msgid "Fibre Channel device not found."
 msgstr "%s'de iSCSI cihazı bulunamadı"
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9624,26 +9660,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9789,32 +9825,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr " [%s] göstergesi bulunamadı"
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9824,39 +9860,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9865,17 +9901,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr "işlem: %s"
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9896,7 +9932,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9939,57 +9975,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9997,311 +10033,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, 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:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, 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:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10364,7 +10399,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10374,12 +10409,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "%r adresini bulmak olanaksız"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10389,116 +10424,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr "Geçersiz bölüm"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10514,75 +10544,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, fuzzy, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr "%(host)s hesaplama sunucusu bulunamadı."
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10614,7 +10644,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10623,37 +10653,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10664,7 +10694,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10703,334 +10733,348 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, fuzzy, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 "İmaj '%(image_id)s' boyut%(size_bytes)d izin verilen örnek  "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11038,167 +11082,162 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "Örnek tür oluşturulamıyor."
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11207,116 +11246,114 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "XVP tekar başlatılıyor"
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "Hatalı ağ biçimi"
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11366,24 +11403,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "%(device)s'daki %(instance_id)s örneğine %(volume_id)s birimini bağla"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11394,7 +11431,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11449,8 +11486,212 @@ msgstr "İmaj müsait olmak zorunda"
 msgid "status must be 'available'"
 msgstr "İmaj müsait olmak zorunda"
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr "Sürüm tam sayı olmak zorunda"
+
+#~ msgid "Unknown action"
+#~ msgstr "Tanınmayan zincir: %r"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "%(volume_id)s bölümü hiçbir şeyle ilişkilendirilmedi"
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "%(host)s sunucusu bulunamadı."
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr "Güncel göç işlemi %(dest)s'da bir hata ile karşılaştı"
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr "%(dest)s'a örnek göçü işlemi başarıyla tamamlandı."
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "%(device)s'daki %(instance_id)s örneğine %(volume_id)s birimini bağla"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index 2c6cd055c..5f7e9abad 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,125 +1588,125 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr "Занадто багато невдалих аутентифікацій."
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "Занадто багато невдалих аутентифікацій."
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1711,262 +1716,262 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Це правило вже існує в групі %s"
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Створити розділ на %s ГБ"
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Від'єднати том %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Від'єднати том %s"
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "лише група \"всі\" підтримується"
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2756,7 +2761,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3069,7 +3074,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3097,34 +3102,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "Оголошення черги %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "Оголошення черги %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3259,18 +3264,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3309,23 +3331,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3561,30 +3591,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3594,35 +3624,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3643,313 +3673,313 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "отримано %s"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4002,52 +4032,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4055,152 +4085,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4258,691 +4288,686 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5042,11 +5067,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5056,7 +5081,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5149,11 +5174,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5171,44 +5196,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5225,57 +5250,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5299,7 +5324,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5469,23 +5494,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5510,109 +5535,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5620,98 +5645,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5839,7 +5864,7 @@ 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:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5853,45 +5878,45 @@ msgstr "Вилучити групу безпеки %s"
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5912,12 +5937,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6615,7 +6640,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6733,7 +6758,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,7 +6797,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7029,71 +7054,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7103,22 +7128,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7184,36 +7209,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7223,25 +7248,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7250,24 +7275,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8035,16 +8060,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8387,12 +8412,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8550,7 +8575,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8569,250 +8594,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8820,73 +8855,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8894,50 +8931,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8947,67 +8984,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9018,25 +9055,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9223,7 +9260,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9260,14 +9297,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9275,7 +9312,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9283,7 +9320,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9291,7 +9328,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9299,87 +9336,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9483,26 +9520,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9648,32 +9685,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9683,39 +9720,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9724,17 +9761,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9755,7 +9792,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9798,57 +9835,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9856,311 +9893,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Від'єднати том %s"
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Від'єднати том %s"
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10223,7 +10259,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10232,12 +10268,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10246,116 +10282,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10371,75 +10402,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Оголошення черги %s"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10471,7 +10502,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10480,37 +10511,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10521,7 +10552,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10560,332 +10591,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10893,166 +10938,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11061,114 +11101,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
-#, fuzzy, python-format
-msgid "Creating SR %(label)s"
-msgstr "Від'єднати том %s"
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11218,24 +11256,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11246,7 +11284,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11299,8 +11337,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr "Від'єднати том %s"
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/vi_VN/LC_MESSAGES/nova.po b/nova/locale/vi_VN/LC_MESSAGES/nova.po
index 24b91f7c6..bcbe8473e 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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) "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index 28cd96a01..1ff255406 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr "块设备列表 block_device_list %s"
@@ -180,7 +180,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr "密钥对数据无效"
 
@@ -1031,342 +1031,347 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
+msgstr ""
+
+#: nova/exception.py:972
 msgid "Instance type's memory is too small for requested image."
 msgstr "实例类型的内存对于所请求的镜像太小。"
 
-#: nova/exception.py:972
+#: nova/exception.py:976
 msgid "Instance type's disk is too small for requested image."
 msgstr "实例类型的磁盘对于所请求的镜像太小。"
 
-#: nova/exception.py:976
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "没有足够的可用内存来启动计算节点  %(uuid)s。"
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "无法获取此主机的带宽、CPU和磁盘指标。"
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr "超出配额"
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr "超过个性化文件限制"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr "个性化文件路径太长"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr "个性化文件内容太长"
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, 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:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "找不到聚合 %(aggregate_id)s。"
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "聚合 %(aggregate_name)s 已经存在。"
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "聚合 %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, 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:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "聚合 %(aggregate_id)s已经有主机 %(host)s。"
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr "无法创建实例类型。"
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "检测到已存在的id为%(vlan) vlan"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "没有为实例 %(instance_id)s 找到控制台。"
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "卷 %(volume_id)s 没有找到。"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "没有找到实例 %(instance_id)s"
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "释放实例的网络"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "释放实例的网络"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, 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:1160
+#: nova/exception.py:1164
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。"
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "该驱动不能执行set_admin_password。"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "实例 %(instance_id)s 不在救援模式。"
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "实例 %(instance_id)s 不在救援模式。"
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "实例类型 %(name)s 已经存在。"
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "期望的对象类型：%s"
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1389,7 +1394,7 @@ msgstr "向调度器通报能力。"
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "为ip： %s获取元数据失败"
@@ -1427,31 +1432,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, fuzzy, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr "启动 %(topic)s 节点 (版本 %(vcs_string)s)"
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "为服务 %s 创建消费者"
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr "因无数据库记录，服务已被中止"
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1465,62 +1470,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr "回调中debug：%s"
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "本地IP地址没有找到：%s"
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "无法连接到 %(interface)s 的本地IP：%(ex)s"
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "无效的后台：%s"
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, fuzzy, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr "未知的基文件：%s"
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "期望的对象类型：%s"
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "不正确的server_string：%s"
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc：'%(name)s' 用了%(total_time).2f 秒"
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "移除容器失败：%s"
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "服务器名称不是字符串或者unicode"
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, fuzzy, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr "密钥对名称长度必须在1到255个字符之间"
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1601,125 +1606,125 @@ msgstr "%(code)s: %(message)s"
 msgid "FaultWrapper: %s"
 msgstr "FaultWrapper: %s"
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr "认证失败过多"
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr "访问密钥 %(access_key)s 有错误 %(failures)d，认证失败将被锁定 %(lock_mins)d 分钟。"
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr "签名没有提供"
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr "访问密钥没有提供"
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr "与keystone交流失败"
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, fuzzy, python-format
 msgid "Keystone failure: %s"
 msgstr "预在线迁移在%(dest)s失败"
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 #, fuzzy
 msgid "Timestamp failed validation."
 msgstr "认证失败过多"
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr "执行: %s"
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "为controller=%(controller)s 以及 action=%(action)s未验证的请求"
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "引起异常 InstanceNotFound: %s"
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "引起异常 VolumeNotFound: %s"
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "引起异常 SnapshotNotFound: %s"
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "引起异常 NotFound: %s"
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "引起异常 KeyPairExists: %s"
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, fuzzy, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr "引起异常 InvalidRequest: %s"
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "引起异常 InvalidParameterValue: %s"
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "引起异常 InvalidPortRange: %s"
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "引起异常 NotAuthorized: %s"
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "引起异常 InvalidRequest: %s"
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "引起意外的错误：%s"
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "引起意外的错误：%s"
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr "Environment: %s"
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "发生了一个未知的错误. 请重试你的请求."
@@ -1729,274 +1734,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:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "创建卷 %s 的快照"
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "解密私钥失败：%s"
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr "创建密钥对 %s"
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr "导入密钥 %s"
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr "删除密钥对 %s"
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "参数不够创建有效规则。"
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "无效的IP协议 %(protocol)s。"
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr "对给定的参数无特定规则。"
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "这条规则已经存在于组%s 中"
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "从快照 %s 创建卷"
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "创建 %s GB的卷"
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 #, fuzzy
 msgid "Delete Failed"
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, 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:887
+#: nova/api/ec2/cloud.py:898
 #, fuzzy
 msgid "Attach Failed."
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "分离卷 %s"
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "分离卷 %s"
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "属性不支持: %s"
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr "分配地址"
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 #, fuzzy
 msgid "No more floating IPs available"
 msgstr "没有更多的浮动ip。"
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr "释放地址 %s"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 #, fuzzy
 msgid "Unable to release IP Address."
 msgstr "无法找到地址 %r"
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, 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:1260
+#: nova/api/ec2/cloud.py:1271
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "无法找到地址 %r"
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "没有浮动IP可用。"
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "无法找到地址 %r"
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr "取消地址 %s 的关联"
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "浮动ip %(address)s 没有被关联。"
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr "镜像必须可用。"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr "准备开始终止实例"
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr "重启实例 %r"
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr "准备停止实例"
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr "准备启动实例"
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr "解除镜像 %s 的注册"
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, 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:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr "用户或者组没有确定"
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr "仅仅支持组\"all\""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr "operation_type必须添加或者移除"
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "正在更新镜像 %s 的 publicity 属性"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "无法在 %d 秒内停止实例"
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "获取实例列表"
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "实例 - %s 不存在"
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "获取实例列表"
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "无效的"
@@ -2803,7 +2808,7 @@ msgstr "createBackup的属性 'rotation'必须是整数"
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr "没有找到实例"
 
@@ -3135,7 +3140,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "浮动ip %(address)s 没有被关联。"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3164,34 +3169,34 @@ msgstr "无效的状态：'%s'"
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, fuzzy, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr "把主机 %(host)s 设置为 %(state)s。"
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, fuzzy, python-format
 msgid "Enabling host %s."
 msgstr "调用 getter %s"
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, fuzzy, python-format
 msgid "Disabling host %s."
 msgstr "正在更新主机状态"
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource是只有管理员才能执行的功能。"
 
@@ -3332,19 +3337,36 @@ msgstr "添加安全组规则：%r"
 msgid "Create networks failed"
 msgstr "创建失败"
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
-#, fuzzy, python-format
-msgid "Quota for %s should be integer."
-msgstr "version应该是整数"
+#: nova/api/openstack/compute/contrib/quotas.py:152
+#, python-format
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
+msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
 msgid "Malformed scheduler_hints attribute"
@@ -3383,27 +3405,34 @@ msgstr "没有指定安全组"
 msgid "Security group name cannot be empty"
 msgstr "安全组名称不能是空"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 #, fuzzy
 msgid "start instance"
 msgstr "启动实例 %r"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 #, fuzzy
 msgid "stop instance"
 msgstr "停止实例 %r"
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "未知链：%r"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 #, fuzzy
 msgid "Unknown service"
 msgstr "未知的guestmount错误"
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3640,31 +3669,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-#, fuzzy
-msgid "Instance type for vpn instances"
-msgstr "无效的实例类型 %(instance_type)s。"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
+msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr "cloudpipe实例的启动脚本模板"
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr "网络地址已存入openvpn配置"
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr "子网掩码已存入openvpn配置"
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "启动VPN %s"
@@ -3674,35 +3702,35 @@ msgstr "启动VPN %s"
 msgid "Failed to load %s"
 msgstr "无法创建卷"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "元素不是子节点"
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3725,326 +3753,326 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 #, fuzzy
 msgid "Reserved"
 msgstr "已接收 %s"
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "network"
 msgstr "重置网络"
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 #, fuzzy
 msgid "IP address"
 msgstr "起始地址"
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "找不到固定IP。"
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "没有固定ip与实例关联"
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "起始地址"
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "项目"
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 #, fuzzy
 msgid "No networks found"
 msgstr "没有找到网络"
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "创建网络 %(req)s  是必要的。"
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 #, fuzzy
 msgid "instance"
 msgstr "停止实例 %r"
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "服务 %(service_id)s 没有找到。"
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "服务 %(service_id)s 没有找到。"
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "意外错误：%s"
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 #, fuzzy
 msgid "PROJECT"
 msgstr "项目"
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 #, fuzzy
 msgid "Must supply valid parameters to create instance_type"
 msgstr "无法创建实例类型。"
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "实例 - %s 不存在"
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 #, fuzzy
 msgid "Unknown error"
 msgstr "未知的guestmount错误"
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, fuzzy, python-format
 msgid "%s created"
 msgstr "表 |%s| 没有创建"
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 #, fuzzy
 msgid "Valid instance type name is required"
 msgstr "%s 是一个正确的实例名称"
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "类型is = %s"
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4100,57 +4128,57 @@ msgstr "安全组 %s 不能比255个字符更长。"
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "无法附加卷到实例 %s"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "准备运行 %s 个实例"
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "实例类型 %(instance_type_id)s 没有找到。"
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "没有托管实例 %s，立刻删除"
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "准备尝试软删除实例 %s"
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "准备尝试终止实例 %s"
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "准备尝试停止实例 %s"
@@ -4160,154 +4188,154 @@ msgstr "准备尝试停止实例 %s"
 msgid "Going to try to start instance"
 msgstr "准备尝试启动实例 %s"
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr "搜索条件： %s"
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id为空。假定在迁移。"
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, 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:2100
+#: nova/compute/api.py:2103
 #, 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:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "准备尝试终止实例 %s"
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "安全组 %s 既不是字符串也不是unicode"
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "安全组 %s 不能为空。"
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, 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:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr "创建安全组 %s"
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr "安全组 %s 已经存在"
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "无法销毁VBD %s"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "无法销毁VBD %s"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "安全组id应该是整数"
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "没有找到规则 (%s)"
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "添加安全组规则：%r"
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "授权 %s 安全组入口权限"
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "撤销 %s 安全组入口权限"
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr "安全组id应该是整数"
 
@@ -4366,554 +4394,547 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, fuzzy, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr "createBackup的属性 'rotation'必须是整数"
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 #, fuzzy
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr "创建参数必须是正整数"
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "未找到要删除的实例类型 %s"
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "重新启动实例失败"
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, 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:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr "nova-compute重启后，实例正在重启。"
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "虚拟机管理程序驱动不支持防火墙规则"
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "挂起实例失败"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "虚拟机管理程序驱动不支持防火墙规则"
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "意外的状态码"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr "正在检查状态"
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "正在设置 bdm %s"
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr "正在启动虚拟机"
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr "实例网络设置失败"
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "实例的network_info：|%s|"
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr "实例块设备设置失败"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s 实例"
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr "终止bdm %s"
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s。把实例的 vm_state设置为ERROR"
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "正在重新创建实例 %s"
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "为卷 %s 创建快照"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "正在重启虚拟机 %s"
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, 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:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "无法重新创建实例 [%(instance_uuid)s]: %(exc)s"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "实例 %s：重启"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "实例 %s: 快照中"
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, 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:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "找到 %(num_images)d 个镜像 (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "轮换出%d个备份"
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr "正在删除镜像 %s"
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 #, fuzzy
 msgid "Root password set"
 msgstr "实例 %s：Root密码已设置"
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "该驱动不能执行set_admin_password。"
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "该驱动不能执行set_admin_password。"
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 #, fuzzy
 msgid "error setting admin password"
 msgstr "设置管理员密码出错"
 
-#: nova/compute/manager.py:2019
-#, fuzzy, python-format
+#: nova/compute/manager.py:2045
+#, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
-"试图把一个文件注入到没有运行的实例：%(instance_uuid)s (状态: %(current_power_state)s 预计: "
-"%(expected_state)s)"
 
-#: nova/compute/manager.py:2023
-#, fuzzy, python-format
-msgid "injecting file to %(path)s"
-msgstr "注入文件路径：'%s'"
+#: nova/compute/manager.py:2050
+#, python-format
+msgid "injecting file to %s"
+msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "挂起实例失败"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 #, fuzzy
 msgid "Unrescuing"
 msgstr "实例 %s：取消救援"
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "设置实例 %(instance_uuid)s 至 ERROR 状态"
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "实例没有卷。"
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr "目标与来源一样。"
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 #, fuzzy
 msgid "Pausing"
 msgstr "正在更新。"
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "实例 %s ：获取诊断"
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 #, fuzzy
 msgid "Reset network"
 msgstr "重置网络"
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 #, fuzzy
 msgid "Inject network info"
 msgstr "实例 %s：注入网络信息"
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "将注入的network_info：|%s|"
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 #, fuzzy
 msgid "Get console output"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "实例 %s：正在获得VNC控制台"
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 #, fuzzy
 msgid "Getting spice console"
 msgstr "实例 %s：正在获得VNC控制台"
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, 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:3033
+#: nova/compute/manager.py:3062
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "卷 %(volume_id)s 从挂载点 %(mp)s 分离"
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "从未知实例%s中分离卷"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "实例 %s 的网络分配"
 
-#: nova/compute/manager.py:3159
-#, fuzzy, python-format
-msgid "Port %(port_id)s is not attached"
-msgstr "网络 %(network_id)s 没有找到。"
+#: nova/compute/manager.py:3191
+#, python-format
+msgid "Port %s is not attached"
+msgstr ""
 
-#: nova/compute/manager.py:3173
-#, fuzzy, python-format
-msgid "Host %(host)s not found"
-msgstr "主机 %(host)s 没有找到。"
+#: nova/compute/manager.py:3205
+#, python-format
+msgid "Host %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
-msgstr "预在线迁移在%(dest)s失败"
+msgid "Pre live migration failed at %s"
+msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "post_live_migration()已经启动。"
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
-msgstr "把实例迁移到 %(dest)s 成功完成。"
+msgid "Migrating instance to %s finished successfully."
+msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4921,171 +4942,171 @@ msgstr ""
 "你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
 "name。”这个错误可以放心的忽略。"
 
-#: nova/compute/manager.py:3426
+#: nova/compute/manager.py:3458
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "迁移后操作启动"
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "为ip： %s获取元数据失败"
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, 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:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
 
-#: nova/compute/manager.py:3659
-#, fuzzy, python-format
-msgid "Instance %(instance_uuid)s not found"
-msgstr "没有找到实例 %(instance_id)s"
+#: nova/compute/manager.py:3691
+#, python-format
+msgid "Instance %s not found"
+msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 #, fuzzy
 msgid "In ERROR state"
 msgstr "节点处于未知的错误状态。"
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr "更新主机状态"
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, 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:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "实例未启动"
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0，跳过..."
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr "回收删除的实例"
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, fuzzy, python-format
 msgid "No service record for host %s"
 msgstr "计算节点 %s 没有服务"
 
-#: nova/compute/manager.py:4123
-#, fuzzy, python-format
+#: nova/compute/manager.py:4156
+#, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
-msgstr "检测标签名为 '%(name_label)s' 的实例，这些实例被标识为DELETED却仍然存在于主机上。"
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
+msgstr ""
 
-#: nova/compute/manager.py:4130
-#, fuzzy, python-format
+#: nova/compute/manager.py:4162
+#, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
-msgstr "销毁标签名为 '%(name_label)s' 的实例，这些实例被标识为DELETED却仍然存在于主机上。"
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
+msgstr ""
 
-#: nova/compute/manager.py:4137
-#, fuzzy, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
-msgstr "无法识别的FLAGS.running_deleted_instance_action的取值 '%(action)s'"
+#: nova/compute/manager.py:4169
+#, python-format
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
+msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "设置实例 %(instance_uuid)s 至 ERROR 状态"
@@ -5187,11 +5208,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr "未指定计算宿主机"
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "无法找到实例 %s 的宿主机"
@@ -5201,7 +5222,7 @@ msgstr "无法找到实例 %s 的宿主机"
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5298,11 +5319,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "重新启动实例失败"
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 #, fuzzy
 msgid "Failed to notify cells of instance fault"
 msgstr "重新启动实例失败"
@@ -5321,44 +5342,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "无法识别的 read_deleted 取值”%s“"
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "实例 %s：已救援"
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "实例 %s：已救援"
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, fuzzy, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr "实例 %s：已救援"
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "实例 %s：已救援"
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "实例 %s：已救援"
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5375,57 +5396,57 @@ msgstr "version应该是整数"
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 #, fuzzy
 msgid "Unsupported id columns type"
 msgstr "不支持的Content-Type"
@@ -5451,7 +5472,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, fuzzy, python-format
 msgid "fetching image %s from glance"
 msgstr "正在从glance镜像服务器中下载镜像 %s"
@@ -5623,23 +5644,23 @@ msgstr "域 |%(domain)s| 已经存在，把区域改变为 |%(av_zone)s|。"
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "域 |%(domain)s| 已经存在，把项目改变为 |%(project)s|。"
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr "驱动仅支持入口类型 'a'。"
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5664,111 +5685,111 @@ msgstr "试图移除不存在的规则：%(chain)r %(rule)r %(wrap)r %(top)r"
 msgid "IPTablesManager.apply completed with success"
 msgstr "IPTablesManager.apply成功完成"
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, fuzzy, python-format
 msgid "arping error for ip %s"
 msgstr "在 %s 中发生 httplib 错误： "
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, fuzzy, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr "Pid %d 过期了，重新启动dnsmasq"
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "挂起进程 dnsmasq 时抛出 %s"
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d 过期了，重新启动dnsmasq"
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "杀掉进程 radvd 时抛出 %s"
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d 过期了，重新启动radvd"
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, fuzzy, python-format
 msgid "Net device removed: '%s'"
 msgstr "无效的状态：'%s'"
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr "正在开启VLAN接口 %s"
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, fuzzy, python-format
 msgid "Starting Bridge %s"
 msgstr "保证桥 %s"
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, fuzzy, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr "保证vlan %(vlan)s 和桥 %(bridge)s"
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, fuzzy, python-format
 msgid "Failed to add interface: %s"
 msgstr "挂起实例失败"
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "保证桥 %s"
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "保证桥 %s"
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "解除 %s 过期固定ip的关联"
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr "设置网络主机"
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 #, fuzzy
 msgid "network allocations"
 msgstr "实例 %s 的网络分配"
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, fuzzy, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr "为实例 |%(instance_id)s| 获取的网络：|%(networks)s|"
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 #, fuzzy
 msgid "network deallocation for instance"
 msgstr "为实例 |%s| 解除网络分配"
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5778,99 +5799,99 @@ msgstr ""
 "instance-dns-zone是 |%(domain)s|，该域位于区域 |%(zone)s| 中。实例|%(instance)s| 在区域 "
 "|%(zone2)s| 里。没有DNS记录将创建。"
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, fuzzy, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr "%s 的配额超出，尝试分配地址"
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 #, fuzzy
 msgid "Failed to update usages deallocating fixed IP"
 msgstr "在数据库更新卷失败"
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "租用的IP |%(address)s|"
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "没有关联的IP %s 被租用了"
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "没有分配的IP |%s| 被租用了"
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "释放的IP |%(address)s|"
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "没有关联的IP %s 被释放了"
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "没有租用的IP %s 被释放了"
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, fuzzy, python-format
 msgid "%s must be an integer"
 msgstr "offset 参数必须是整数"
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr "cidr 已经在使用"
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的超网络 (%(super)s) 冲突"
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的较小的cidr (%(smaller)s) 冲突"
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr "网络已经存在。"
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "网路在删除前必须与项目 %s 解除关联"
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "网络数量与VLAN起始数之和不能大于4049"
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, fuzzy, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -6001,7 +6022,7 @@ 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:262
+#: nova/network/security_group/quantum_driver.py:263
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "抓到错误：%s"
@@ -6016,46 +6037,46 @@ msgstr "删除安全组 %s"
 msgid "Security group id should be uuid"
 msgstr "安全组id应该是整数"
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "抓到错误：%s"
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, 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:446
+#: nova/network/security_group/quantum_driver.py:444
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6077,12 +6098,12 @@ msgstr "设置管理员密码出错"
 msgid "Invalid version string"
 msgstr "不正确的server_string：%s"
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6796,7 +6817,7 @@ msgstr "无法找到另一个计算节点"
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: 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 状态"
@@ -6914,7 +6935,7 @@ msgstr "计算节点 %s 没有服务"
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "schedule_%(method)s 失败：%(ex)s"
@@ -6953,7 +6974,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7211,7 +7232,7 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 #, fuzzy
 msgid ""
@@ -7219,53 +7240,53 @@ msgid ""
 "instances"
 msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr "正在运行的实例：%s"
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "终止实例之后：%s"
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr "内部错误"
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "强制杀死实例后：%s"
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 #, fuzzy
 msgid "spawn error"
 msgstr "未知的guestmount错误"
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7274,12 +7295,12 @@ msgstr ""
 "下面的迁移缺少了降级：\n"
 "\t%s"
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, fuzzy, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr "地址 |%(address)s| 没有分配"
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7289,22 +7310,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, fuzzy, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr "地址 |%(address)s| 没有分配"
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7374,36 +7395,36 @@ msgstr "解码JSON：%s"
 msgid "fake vswitch not found"
 msgstr "没有找到标记 [%s]"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr "请扩展模拟的 libvirt 模块来支持标记"
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "在%s 创建文件模拟客户代理"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "移除在 %s 的模拟的客户代理文件"
@@ -7413,25 +7434,25 @@ msgstr "移除在 %s 的模拟的客户代理文件"
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "无法加载虚拟驱动：%s"
@@ -7441,25 +7462,25 @@ msgstr "无法加载虚拟驱动：%s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "试图不过滤没有过滤的实例"
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 #, fuzzy
 msgid "Filters added to instance"
 msgstr "过滤器添加给实例 %s"
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr "提供者防火墙规则刷新"
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr "添加安全组规则：%r"
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr "添加提供者规则：%s"
@@ -8239,17 +8260,17 @@ msgstr "实例代理版本：%s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "正在更新主机状态"
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 #, fuzzy
 msgid "get_host_stats called"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, fuzzy, python-format
 msgid "Host IP address is: %s"
 msgstr "释放地址 %s"
@@ -8605,12 +8626,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "为实例 |%s| 分配浮动IP"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "注入文件路径：'%s'"
@@ -8776,7 +8797,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr "无法确定iscsi initiator名字"
 
@@ -8795,262 +8816,272 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, fuzzy, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr "无法为VDI %s 找到VBD"
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "卷组 %s 不存在"
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr "连接 libvirt 失败"
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, 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:749
+#: nova/virt/libvirt/driver.py:778
 #, fuzzy
 msgid "During wait destroy, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr "实例销毁成功。"
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "准备停止实例"
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, 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:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, 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:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "删除实例文件 %(target)s"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "schedule_%(method)s 失败：%(ex)s"
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "无法确定iscsi initiator名字"
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "无法确定iscsi initiator名字"
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 #, fuzzy
 msgid "During detach_volume, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "没有网络定义。"
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "没有网络定义。"
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "重新启动实例失败"
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr "实例在运行"
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data：%(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "用户没有管理员权限"
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr "正在创建镜像"
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "将 %(injection)s 注入到镜像 %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, 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:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9058,74 +9089,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr "无法得到CPU的数目，因为这个函数不是给这个平台执行的。这个错误可以被放心忽略。"
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt版本过旧(不支持getVersion)"
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "正在获取镜像 %s 的大小"
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9133,37 +9166,37 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9172,7 +9205,7 @@ msgstr ""
 "无法迁移%(instance_id)s 到 %(dest)s 上：缺少磁盘(主机:%(available)s <= "
 "实例:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9181,7 +9214,7 @@ msgstr ""
 "已启动实例的CPU信息：\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9196,71 +9229,71 @@ msgstr ""
 "\n"
 "参考 %(u)s"
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "预在线迁移在%(dest)s失败"
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, 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:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "因它像卷，所以跳过 %(path)s"
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 #, fuzzy
 msgid "Starting migrate_disk_and_power_off"
 msgstr "实例 %s：开始执行 migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "实例 %s 成功运行。"
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 #, fuzzy
 msgid "Starting finish_migration"
 msgstr "实例 %s：开始执行 finish_migration"
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 #, fuzzy
 msgid "Starting finish_revert_migration"
 msgstr "实例 %s：开始执行 finish_revert_migration"
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, fuzzy, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr "删除实例文件 %(target)s"
@@ -9271,25 +9304,25 @@ msgid ""
 "correctly."
 msgstr "Libvirt模块无法加载。NWFilterFirewall 无法正常工作。"
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr "在 nwfilter 里调用 setup_basic_filtering"
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr "正在确保静态过滤器"
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr "nwfilter(%(instance_filter_name)s)未找到"
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, 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:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables 防火墙：设置基本的过滤规则"
 
@@ -9480,7 +9513,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9518,14 +9551,14 @@ msgstr "保证桥 %s"
 msgid "Failed while unplugging vif"
 msgstr "移除实例”%s“的虚拟网络设备时失败"
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9533,7 +9566,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9541,7 +9574,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9549,7 +9582,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9557,88 +9590,88 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "在 %s 未找到iSCSI设备"
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, fuzzy, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr "在 %(mount_device)s 上还没有找到iSCSI卷。将再次扫描并重试。尝试次数：%(tries)s"
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, fuzzy, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr "找到iSCSI节点 %(mount_device)s （经过%(tries)s 次再扫描）"
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, fuzzy, python-format
 msgid "%s is already mounted"
 msgstr "镜像已经挂载"
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, fuzzy, python-format
 msgid "AoE device not found at %s"
 msgstr "在 %s 未找到iSCSI设备"
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, fuzzy, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr "在 %(mount_device)s 上还没有找到iSCSI卷。将再次扫描并重试。尝试次数：%(tries)s"
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, fuzzy, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr "找到iSCSI节点 %(mount_device)s （经过%(tries)s 次再扫描）"
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 #, fuzzy
 msgid "Fibre Channel device not found."
 msgstr "在 %s 未找到iSCSI设备"
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, fuzzy, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr "在 %(mount_device)s 上还没有找到iSCSI卷。将再次扫描并重试。尝试次数：%(tries)s"
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, fuzzy, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr "找到iSCSI节点 %(mount_device)s （经过%(tries)s 次再扫描）"
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9746,26 +9779,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr "连接到melange失败"
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9913,32 +9946,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr "针对useconnection_type=vmwareapi必须指定vmwareapi_host_ip,vmwareapi_host_username和vmwareapi_host_password"
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "没有找到标记 [%s]"
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "在vmwareapi：_create_session，得到这个异常：%s"
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "在vmwareapi：_call_method，得到这个异常：%s"
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "任务 [%(task_name)s] %(task_ref)s 状态：成功"
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, 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:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "在vmwareapi：_poll_task，得到这个错误 %s"
@@ -9948,39 +9981,39 @@ msgstr "在vmwareapi：_poll_task，得到这个错误 %s"
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr "调用 RetrieveProperties 时发生错误 %s"
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, 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:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr "没有虚拟机注册"
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr "ref 为 %s 的虚拟机不存在"
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "退出无效的会话或者已经退出了：%s"
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr "会话有错误"
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr "会话无效"
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " 还没有虚拟机被注册"
@@ -9990,17 +10023,17 @@ msgstr " 还没有虚拟机被注册"
 msgid "%(action)s %(host)s"
 msgstr "执行: %s"
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, fuzzy, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr "把主机 %(host)s 设置为 %(state)s。"
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr "Glance 镜像 %s 在被杀死的状态"
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr "Glance 镜像 %(image_id)s 处于未知状态 - %(state)s"
@@ -10021,7 +10054,7 @@ msgstr "正在ESX主机上创建名称为 %s 的端口组"
 msgid "Created Port Group with name %s on the ESX host"
 msgstr "已经在ESX主机上创建了名称为 %s 的端口组"
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, fuzzy, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr "HTTP连接关闭时发生异常 VMWareHTTpWrite. Exception：%s"
@@ -10064,17 +10097,17 @@ msgstr "获取实例列表"
 msgid "Got total of %s instances"
 msgstr "总共获得 %s 个实例"
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 #, fuzzy
 msgid "Creating VM on the ESX host"
 msgstr "在ESX主机上创建名为 %s 的虚拟机"
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 #, fuzzy
 msgid "Created VM on the ESX host"
 msgstr "已经在ESX主机上创建名为 %s 的虚拟机"
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, fuzzy, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
@@ -10083,7 +10116,7 @@ msgstr ""
 "创建 %(vmdk_file_size_in_kb)s KB 大的虚拟磁盘和适配器类型 %(adapter_type)s 在ESX主机的本地存储 "
 "%(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, fuzzy, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
@@ -10092,35 +10125,35 @@ msgstr ""
 "创建 %(vmdk_file_size_in_kb)s KB 大的虚拟磁盘和适配器类型 %(adapter_type)s 在ESX主机的本地存储 "
 "%(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, fuzzy, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr "删除文件 %(flat_uploaded_vmdk_path)s 在ESX主机的本地存储 %(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, fuzzy, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr "删除文件 %(flat_uploaded_vmdk_path)s 在ESX主机的本地存储 %(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr "下载文件数据 %(image_ref)s 到ESX主机的数据存储 %(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, fuzzy, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr "已经下载镜像文件数据 %(image_ref)s 在ESX数据存储 %(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, fuzzy, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -10130,7 +10163,7 @@ msgstr ""
 "创建 %(vmdk_file_size_in_kb)s KB 大的虚拟磁盘和适配器类型 %(adapter_type)s 在ESX主机的本地存储 "
 "%(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, fuzzy, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
@@ -10139,334 +10172,333 @@ msgstr ""
 "创建 %(vmdk_file_size_in_kb)s KB 大的虚拟磁盘和适配器类型 %(adapter_type)s 在ESX主机的本地存储 "
 "%(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 #, fuzzy
 msgid "Powering on the VM instance"
 msgstr "正启动虚拟机实例 %s"
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 #, fuzzy
 msgid "Powered on the VM instance"
 msgstr "已经启动虚拟机实例 %s"
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 #, fuzzy
 msgid "Creating Snapshot of the VM instance"
 msgstr "正在创建虚拟机实例快照 %s "
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 #, fuzzy
 msgid "Created Snapshot of the VM instance"
 msgstr "已经创建虚拟机实例快照 %s "
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 #, fuzzy
 msgid "Copying disk data before snapshot of the VM"
 msgstr "正在快照虚拟机实例 %s 之前复制磁盘数据"
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 #, fuzzy
 msgid "Copied disk data before snapshot of the VM"
 msgstr "已经在快照虚拟机实例 %s 之前复制磁盘数据"
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr "上传镜像 %s"
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr "已经上传镜像  %s"
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr "正在删除临时的vmdk文件 %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr "已经删除临时的vmdk文件 %s"
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr "实例未启动"
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 #, fuzzy
 msgid "Rebooting guest OS of VM"
 msgstr "正在重启虚拟机客户操作系统 %s"
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 #, fuzzy
 msgid "Rebooted guest OS of VM"
 msgstr "已经重启虚拟机客户操作系统 %s"
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 #, fuzzy
 msgid "Doing hard reboot of VM"
 msgstr "正在冷启动虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 #, fuzzy
 msgid "Did hard reboot of VM"
 msgstr "已经冷启动虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-#, fuzzy
-msgid "instance not present"
-msgstr "实例 - %s 不存在"
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "重启xvp"
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "已经注销虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, fuzzy, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr "注销虚拟机时在 vmwareapi:vmops:destroy 中发生异常：%s"
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 #, fuzzy
 msgid "Powering off the VM"
 msgstr "正在关闭虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 #, fuzzy
 msgid "Powered off the VM"
 msgstr "关闭虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 #, fuzzy
 msgid "Unregistering the VM"
 msgstr "正在注销虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 #, fuzzy
 msgid "Unregistered the VM"
 msgstr "已经注销虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr "注销虚拟机时在 vmwareapi:vmops:destroy 中发生异常：%s"
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, fuzzy, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr "正在删除虚拟机 %(name)s 的内容位置在数据存储 %(datastore_name)s 中"
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, fuzzy, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr "已经删除虚拟机 %(name)s 的内未知在数据存储 %(datastore_name)s 中"
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr "当从磁盘删除虚拟机的内容时在 vmwareapi:vmops:destroy 里发生异常：%s"
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr "vmwareapi 不支持暂停"
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr "vmwareapi 不支持取消暂停"
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 #, fuzzy
 msgid "Suspending the VM"
 msgstr "挂起虚拟机 %s "
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 #, fuzzy
 msgid "Suspended the VM"
 msgstr "已经挂起虚拟机 %s "
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 #, fuzzy
 msgid "instance is powered off and cannot be suspended."
 msgstr "实例已关闭，无法挂起。"
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 #, fuzzy
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr "虚拟机 %s 已经在挂起状态。不做任何操作直接返回"
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 #, fuzzy
 msgid "Resuming the VM"
 msgstr "正在恢复虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 #, fuzzy
 msgid "Resumed the VM"
 msgstr "已经恢复虚拟机 %s "
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr "实例不在挂起状态"
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 #, fuzzy
 msgid "instance is suspended and cannot be powered off."
 msgstr "实例未启动"
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 #, fuzzy
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr "虚拟机 %s 已经在挂起状态。不做任何操作直接返回"
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 #, fuzzy
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr "虚拟机 %s 已经在挂起状态。不做任何操作直接返回"
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 #, fuzzy
 msgid "Powering on the VM"
 msgstr "正在关闭虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 #, fuzzy
 msgid "Powered on the VM"
 msgstr "关闭虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "正在删除volumeID：%s "
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+#, fuzzy
+msgid "instance not present"
+msgstr "实例 - %s 不存在"
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, 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:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "正在删除volumeID：%s "
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "从快照 %s 创建卷"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "自动冷重启 %d"
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr "get_diagnostics 没有在 vmwareapi 里实现"
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 #, fuzzy
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr "正在重新配置虚拟机实例 %s 来附加镜像磁盘"
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 #, fuzzy
 msgid "Reconfigured VM instance to set the machine id"
 msgstr "已经重新配置虚拟机实例 %s 来附加于镜像磁盘"
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, 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:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, 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:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "正在使用路径 %s 创建目录"
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr "已经创建路径为 %s 的目录"
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr "正在从glance镜像服务器中下载镜像 %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr "已经从glance镜像服务器中下载镜像 %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr "正在向Glance镜像服务器上传镜像 %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr "已经向Glance镜像服务器上传了镜像 %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr "正在获取镜像 %s 的大小"
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "获得大小为 %(size)s 的镜像目的为了 %(image)s"
@@ -10529,7 +10561,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
@@ -10539,12 +10571,12 @@ msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find iSCSI Target"
 msgstr "无法找到地址 %r"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 附加到实例 %(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "分离_volume: %(instance_name)s, %(mountpoint)s"
@@ -10554,118 +10586,111 @@ msgstr "分离_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "没有在数据库找到卷"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
-#, fuzzy, python-format
+#: nova/virt/xenapi/agent.py:123
+#, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
-"%(method)s 的代理调用返回无效的响应：%(ret)r。虚拟机id=%(instance_uuid)s; path=%(path)s; "
-"args=%(addl_args)r"
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
-msgstr "查询代理版本失败：%(resp)r"
+msgid "Failed to query agent version: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr "查询代理版本"
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "把代理更新为 %s"
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
-msgstr "更新代理失败：%(resp)r"
+msgid "Failed to update agent: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr "设置管理员密码"
 
-#: nova/virt/xenapi/agent.py:204
-#, python-format
-msgid "Failed to exchange keys: %(resp)r"
-msgstr "交换钥匙失败：%(resp)r"
-
-#: nova/virt/xenapi/agent.py:224
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr "更新密码失败：%(resp)r"
+msgid "Failed to exchange keys: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
-msgstr "注入文件失败：%(resp)r"
+msgid "Failed to inject file: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr "重置网络"
 
-#: nova/virt/xenapi/agent.py:286
-#, fuzzy, python-format
-msgid "Failed to reset network: %(resp)r"
-msgstr "注入文件失败：%(resp)r"
+#: nova/virt/xenapi/agent.py:290
+#, python-format
+msgid "Failed to reset network: %r"
+msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr "安装在该镜像的XenServer工具可以进行网络注入。网络文件不会被操作。"
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr "该镜像有XenServer工具，但是不能进行网络注入"
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr "没有在该镜像上安装XenServer工具"
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL错误：%s"
@@ -10684,75 +10709,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "解密私钥失败：%s"
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr "不支持在XenServer启动主机"
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "无法登录到XenAPI(Dom0磁盘是空么？)"
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr "得到异常：%s"
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr "产生 NotImplemented 错误"
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake 没有 %s 的实现"
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
-msgstr "正在调用 %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
+msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr "调用 getter %s"
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "调用 getter %s"
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr "xenapi.fake 没有 %s 的实现或者调用时用了错误数目的参数"
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, fuzzy, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr "计算主机 %(host)s 没有找到。"
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10785,7 +10810,7 @@ msgstr "发现桥 %s 的网络不唯一"
 msgid "Found no network for bridge %s"
 msgstr "发现网桥 %s 没有网络"
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10794,37 +10819,37 @@ msgstr "聚合 %(aggregate_id)s已经有主机 %(host)s。"
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
-#, fuzzy, python-format
-msgid "Unable to join %(host)s in the pool"
-msgstr "无法找到实例 %s 的宿主机"
+#, python-format
+msgid "Unable to join %s in the pool"
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
-#, fuzzy, python-format
-msgid "Pool-eject failed: %(e)s"
-msgstr "注入文件失败：%(resp)r"
+#, python-format
+msgid "Pool-eject failed: %s"
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "无法使用全局角色 %(role_id)s"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10835,11 +10860,9 @@ msgstr "没有找到设备 %s 的PIF"
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
-"网络 %(bridge)s 的 PIF %(pif_rec['uuid'])s  有VLAN id %(pif_vlan)d。期待的数目是 "
-"%(vlan_num)d"
 
 #: nova/virt/xenapi/vm_utils.py:275
 #, fuzzy
@@ -10878,37 +10901,37 @@ msgstr "已经分离"
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "无法移除 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "无法销毁 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "创建了VBD %(vbd_ref)s 目的是为了虚拟机 %(vm_ref)s，VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "创建了VBD %(vbd_ref)s 目的是为了虚拟机 %(vm_ref)s，VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "无法销毁 VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -10917,298 +10940,312 @@ msgstr ""
 "创建了 VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) 位置在"
 " %(sr_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 #, fuzzy
 msgid "SR not present and could not be introduced"
 msgstr "无法找到实例"
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, fuzzy, python-format
 msgid "block device info: %s"
 msgstr "块设备列表 block_device_list %s"
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "克隆了 VDI %(vdi_ref)s 对象来自VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:638
-#, fuzzy, python-format
-msgid "No primary VDI found for %(vm_ref)s"
-msgstr "未找到 %(vm_ref)s 的主VDI"
+#: nova/virt/xenapi/vm_utils.py:645
+#, python-format
+msgid "No primary VDI found for %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
-msgstr "只能在ext类型的缺省本地存储库支持快速克隆。这个系统的存储库类型为 %(sr_type)s。忽略此 cow 标记。"
+"this system was found to be of type %s. Ignoring the cow flag."
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, fuzzy, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr "xapi 'download_vhd' 返回“%(vdi_type)s”类型的VDI，其UUID为 “%(vdi_uuid)s”"
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
-#, fuzzy, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
-msgstr "请求 xapi 获取 vhd 镜像 %(image)s"
+#: nova/virt/xenapi/vm_utils.py:1135
+#, python-format
+msgid "Asking xapi to fetch vhd image %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, fuzzy, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr "镜像大小 %(size_bytes)d 超过instance_type所允许的小大 %(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "镜像 %(image)s 的大小：%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr "内核/内存盘镜像太大：%(vdi_size)d 字节，最大 %(max_size)d 字节"
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "将VDI %s 复制到dom0的/boot/guest下"
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "内核/内存盘 VDI %s 已销毁"
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "实例 %s：获取Glance镜像失败"
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "检测到 %(image_type_str)s 格式，目标是镜像 %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "为PV内核查询vdi %s"
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
-msgstr "未知的镜像格式 %(disk_image_type)s"
+msgid "Unknown image format %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s 依然可用"
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "重新扫描存储库 %s"
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "标记sr_matching_filter '%s' 没有遵循格式要求"
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr "XenAPI无法找到安装客户实例的存储库。请检查你的配置或者配置标记'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr "无法找到content-type ISO的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
-msgstr "ISO：正在查看存储库 %(sr_rec)s"
+msgid "ISO: looking at SR %s"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr "ISO：非iso内容"
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO：iso content_type，没有 'i18n-key' 键"
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO：iso content_type，i18n-key的值不是 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: 存储库符合标准"
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, 正在查看是否是本地的主机"
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
-msgstr "ISO: PBD %(pbd_ref)s 消失了"
+msgid "ISO: PBD %s disappeared"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: PBD匹配, 想要 %(pbd_rec)s, 目前有 %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr "ISO：含有本地PBD的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr "无法为含服务器详细信息的虚拟机 %(vm_uuid)s 获取RRD XML：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
-msgstr "无法获取包含服务器详细情况的RRD XML更新：%(server)s。"
+msgid "Unable to obtain RRD XML updates with server details: %s."
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "来自Xenserver无效的统计数据：%s"
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, fuzzy, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr "VHD %(vdi_uuid)s 有父 %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "父标识 %(parent_uuid)s 和原先的父标识 %(original_parent_uuid)s 不匹配，正在等待合并..."
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
-msgstr "VHD coalesce 将要超过(%(max_attempts)d)，放弃中..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "等待设备 %s 创建超时"
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "插入VBD %s... "
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "插入VBD %s 完成。"
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s 作为 %(orig_dev)s 插入"
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s 插入错误的设备，重新映射为 %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "正在销毁VDI为 %s 的 VBD "
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "已经销毁VDI为 %s 的 VBD"
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "对 %s 运行pygrub"
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "找到Xen内核 %s"
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "没有找到Xen内核。正在启动HVM。"
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -11216,172 +11253,167 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr "分区："
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr "将分区表 %(primary_first)d %(primary_last)d 写入到 %(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "完成写入分区表 %s 。"
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr "直接操作接口文件"
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "挂载文件系统失败(期望的是非Linux实例)：%s"
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
-#, fuzzy, python-format
-msgid "Updating progress to %(progress)d"
-msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
+#, python-format
+msgid "Updating progress to %d"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, fuzzy, python-format
 msgid "Importing image upload handler: %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 #, fuzzy
 msgid "Starting instance"
 msgstr "正在启动虚拟机"
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "从 dom0 中移除内核/内存盘文件"
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, fuzzy, python-format
 msgid "Block device information present: %s"
 msgstr "block_device_mapping %s"
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "在数据库更新卷失败"
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 #, fuzzy
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr "正在自动配置实例 %(instance_uuid)s 的磁盘，尝试调整分区大小..."
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 #, fuzzy
 msgid "Starting VM"
 msgstr "重启xvp"
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr "%(hypervisor)s/%(os)s/%(architecture)s 最新的agent build 是 %(version)s 版本"
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "没有找到 %(hypervisor)s/%(os)s/%(architecture)s 的代理创建"
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "实例代理版本：%s"
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr "设置VCPU 权重"
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, fuzzy, python-format
 msgid "Could not find VM with name %s"
 msgstr "找不到VDI ref"
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "快照完毕并为虚拟机 %s 上传"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr "将 vhd 转移到新主机失败"
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "重新启动实例失败"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "将 VDI %(vdi_uuid)s 由 %(old_gb)dGB 调大到  %(new_gb)dGB"
@@ -11391,126 +11423,124 @@ msgstr "将 VDI %(vdi_uuid)s 由 %(old_gb)dGB 调大到  %(new_gb)dGB"
 msgid "Resize complete"
 msgstr "调整实例 %s 的大小完毕"
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 #, fuzzy
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "无法为VDI %s 找到VBD"
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 #, fuzzy
 msgid "Destroying VDIs"
 msgstr "重启xvp"
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 #, fuzzy
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr "实例 %(instance_uuid)s 使用RAW或者VHD，跳过内核和内存盘的删除"
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "实例拥有内核或者内存盘，但不是二者均有"
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr "内核/内存盘文件移除了"
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 #, fuzzy
 msgid "Destroying VM"
 msgstr "重启xvp"
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr "虚拟机不存在，跳过销毁..."
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "实例已处于救援模式：%s"
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 #, fuzzy
 msgid "VM is not present, skipping soft delete..."
 msgstr "虚拟机不存在，跳过销毁..."
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 #, fuzzy
 msgid "Automatically hard rebooting"
 msgstr "自动冷重启 %d"
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "为虚拟机注入网络信息到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 #, fuzzy
 msgid "Creating vifs"
 msgstr "正在创建镜像"
 
-#: nova/virt/xenapi/vmops.py:1549
-#, fuzzy, python-format
-msgid "Creating VIF for network %(network_ref)s"
-msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
+#: nova/virt/xenapi/vmops.py:1571
+#, python-format
+msgid "Creating VIF for network %s"
+msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 #, fuzzy
 msgid "Injecting hostname to xenstore"
 msgstr "为虚拟机注入hostname到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 #, fuzzy
 msgid "No suitable network for migrate"
 msgstr "错误的网络格式"
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 #, fuzzy
 msgid "Migrate Send failed"
 msgstr "创建失败"
 
 #: nova/virt/xenapi/volume_utils.py:51
-#, fuzzy, python-format
-msgid "Creating SR %(label)s"
-msgstr "正在创建存储库 %s"
+#, python-format
+msgid "Creating SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
-#, fuzzy, python-format
-msgid "Introducing SR %(label)s"
-msgstr "引入存储库 %s"
+#, python-format
+msgid "Introducing SR %s"
+msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
 #, fuzzy
@@ -11560,25 +11590,25 @@ msgstr "无法为存储库 %s 引入VDI"
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
-#, fuzzy, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
-msgstr "无法获得目标信息 %(data)s, %(mountpoint)s"
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
+#, python-format
+msgid "Unable to obtain target information %s"
+msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
-#, fuzzy, python-format
-msgid "Unable to obtain target information %(connection_data)s"
-msgstr "无法获得目标信息 %(data)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:47
+#, python-format
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
-#, fuzzy, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
-msgstr "实例 %(instance_id)s 没有找到。"
+#: nova/virt/xenapi/volumeops.py:143
+#, python-format
+msgid "Skipping detach because VBD for %s was not found"
+msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
 #, python-format
@@ -11588,7 +11618,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, fuzzy, python-format
 msgid "upload_vhd failed: %r"
 msgstr "未知的基文件：%s"
@@ -11643,8 +11673,218 @@ msgstr "状态必须可用"
 msgid "status must be 'available'"
 msgstr "状态必须可用"
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr "version应该是整数"
+
+#~ msgid "Unknown action"
+#~ msgstr "未知链：%r"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr "无效的实例类型 %(instance_type)s。"
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "无法重新创建实例 [%(instance_uuid)s]: %(exc)s"
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+#~ "试图把一个文件注入到没有运行的实例：%(instance_uuid)s (状态: "
+#~ "%(current_power_state)s 预计: %(expected_state)s)"
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr "注入文件路径：'%s'"
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr "网络 %(network_id)s 没有找到。"
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr "主机 %(host)s 没有找到。"
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr "预在线迁移在%(dest)s失败"
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr "把实例迁移到 %(dest)s 成功完成。"
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr "没有找到实例 %(instance_id)s"
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr "检测标签名为 '%(name_label)s' 的实例，这些实例被标识为DELETED却仍然存在于主机上。"
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr "销毁标签名为 '%(name_label)s' 的实例，这些实例被标识为DELETED却仍然存在于主机上。"
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr "无法识别的FLAGS.running_deleted_instance_action的取值 '%(action)s'"
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+#~ "%(method)s 的代理调用返回无效的响应：%(ret)r。虚拟机id=%(instance_uuid)s; "
+#~ "path=%(path)s; args=%(addl_args)r"
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr "查询代理版本失败：%(resp)r"
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr "更新代理失败：%(resp)r"
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr "交换钥匙失败：%(resp)r"
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr "更新密码失败：%(resp)r"
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr "注入文件失败：%(resp)r"
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr "注入文件失败：%(resp)r"
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr "正在调用 %(localname)s %(impl)s"
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr "无法找到实例 %s 的宿主机"
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr "注入文件失败：%(resp)r"
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "无法使用全局角色 %(role_id)s"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
 #~ msgstr ""
+#~ "网络 %(bridge)s 的 PIF %(pif_rec['uuid'])s  "
+#~ "有VLAN id %(pif_vlan)d。期待的数目是 %(vlan_num)d"
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr "未找到 %(vm_ref)s 的主VDI"
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr "只能在ext类型的缺省本地存储库支持快速克隆。这个系统的存储库类型为 %(sr_type)s。忽略此 cow 标记。"
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr "请求 xapi 获取 vhd 镜像 %(image)s"
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr "未知的镜像格式 %(disk_image_type)s"
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr "ISO：正在查看存储库 %(sr_rec)s"
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr "ISO: PBD %(pbd_ref)s 消失了"
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr "无法获取包含服务器详细情况的RRD XML更新：%(server)s。"
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr "VHD coalesce 将要超过(%(max_attempts)d)，放弃中..."
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr "正在创建存储库 %s"
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr "引入存储库 %s"
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr "无法获得目标信息 %(data)s, %(mountpoint)s"
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr "无法获得目标信息 %(data)s, %(mountpoint)s"
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
+#~ msgstr "实例 %(instance_id)s 没有找到。"
 
diff --git a/nova/locale/zh_HK/LC_MESSAGES/nova.po b/nova/locale/zh_HK/LC_MESSAGES/nova.po
index 0f5843845..61ee5d7c5 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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) "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2754,7 +2759,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3067,7 +3072,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3095,34 +3100,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3257,18 +3262,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3306,23 +3328,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-msgid "Unknown action"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3558,30 +3588,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3591,35 +3621,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3640,312 +3670,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3998,52 +4028,52 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4051,152 +4081,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4254,690 +4284,685 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
+#: nova/compute/manager.py:1848
 #, python-format
-msgid "Cannot reboot instance: %(exc)s"
+msgid "Cannot reboot instance: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5037,11 +5062,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5051,7 +5076,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5144,11 +5169,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5166,44 +5191,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5220,57 +5245,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5294,7 +5319,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5464,23 +5489,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5505,109 +5530,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5615,98 +5640,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5834,7 +5859,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5847,45 +5872,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5906,12 +5931,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6609,7 +6634,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6727,7 +6752,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6766,7 +6791,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7023,71 +7048,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7097,22 +7122,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7178,36 +7203,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7217,25 +7242,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7244,24 +7269,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8029,16 +8054,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8381,12 +8406,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8544,7 +8569,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8563,250 +8588,260 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8814,73 +8849,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8888,50 +8925,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8941,67 +8978,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9012,25 +9049,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9217,7 +9254,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9254,14 +9291,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9269,7 +9306,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9277,7 +9314,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9285,7 +9322,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9293,87 +9330,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9477,26 +9514,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9642,32 +9679,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9677,39 +9714,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9718,17 +9755,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9749,7 +9786,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9792,57 +9829,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9850,311 +9887,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10217,7 +10253,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10226,12 +10262,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10240,116 +10276,111 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:224
-#, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10365,75 +10396,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10465,7 +10496,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10474,37 +10505,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
 #, python-format
-msgid "Unable to set up pool: %(e)s."
+msgid "Unable to set up pool: %s."
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10515,7 +10546,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10554,332 +10585,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10887,166 +10932,161 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 msgid "Unable to terminate instance."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11055,114 +11095,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11211,24 +11249,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
-msgid "Connect_volume: %(connection_info)s"
+msgid "Connect_volume: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11239,7 +11277,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11292,8 +11330,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr ""
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr ""
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr ""
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""
 
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 591527ba6..e810e9e0a 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-11 19:37+0000\n"
+"POT-Creation-Date: 2013-06-15 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/block_device.py:343 nova/virt/hyperv/basevolumeutils.py:91
+#: nova/block_device.py:344 nova/virt/hyperv/basevolumeutils.py:91
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
@@ -177,7 +177,7 @@ msgid ""
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:462
+#: nova/exception.py:246 nova/api/ec2/cloud.py:473
 msgid "Keypair data is invalid"
 msgstr "無效的Keypair"
 
@@ -1019,337 +1019,342 @@ msgid "Resize error: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:968
-msgid "Instance type's memory is too small for requested image."
+#, python-format
+msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
 #: nova/exception.py:972
-msgid "Instance type's disk is too small for requested image."
+msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
 #: nova/exception.py:976
+msgid "Instance type's disk is too small for requested image."
+msgstr ""
+
+#: nova/exception.py:980
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:995
+#: nova/exception.py:999
 #, 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:1000
+#: nova/exception.py:1004
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1024 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1028
+#: nova/exception.py:1032
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1036
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1045
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1049
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1053
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1054
+#: nova/exception.py:1058
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1062
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1066
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1077
+#: nova/exception.py:1081
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1085
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1126
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1127
+#: nova/exception.py:1131
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1132
+#: nova/exception.py:1136
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/exception.py:1136
+#: nova/exception.py:1140
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1144
 #, 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:1146
+#: nova/exception.py:1150
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1154
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1159
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1164
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1168
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1169
+#: nova/exception.py:1173
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1177
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1181
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1185
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1186
+#: nova/exception.py:1190
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1191
+#: nova/exception.py:1195
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1196
+#: nova/exception.py:1200
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1201
+#: nova/exception.py:1205
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1209
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/exception.py:1209
+#: nova/exception.py:1213
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/exception.py:1214
+#: nova/exception.py:1218
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1219
+#: nova/exception.py:1223
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1225
+#: nova/exception.py:1229
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1233
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1237
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1241
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1245
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1249
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1253
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1254
+#: nova/exception.py:1258
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1259
+#: nova/exception.py:1263
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,7 +1377,7 @@ msgstr ""
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:232
+#: nova/notifications.py:233
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1409,31 +1414,31 @@ msgstr ""
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
 
-#: nova/service.py:152
+#: nova/service.py:153
 #, python-format
 msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
-#: nova/service.py:169 nova/openstack/common/rpc/service.py:47
+#: nova/service.py:170 nova/openstack/common/rpc/service.py:47
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:189
+#: nova/service.py:190
 #, python-format
 msgid "Join ServiceGroup membership for this service %s"
 msgstr ""
 
-#: nova/service.py:269
+#: nova/service.py:270
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:291
+#: nova/service.py:292
 #, python-format
 msgid "Temporary directory is invalid: %s"
 msgstr ""
 
-#: nova/service.py:393
+#: nova/service.py:394
 msgid "serve() can only be called once"
 msgstr ""
 
@@ -1447,62 +1452,62 @@ msgstr ""
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:333
+#: nova/utils.py:334
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:337
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:376
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:437
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:565
+#: nova/utils.py:566
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:594
+#: nova/utils.py:595
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:731
+#: nova/utils.py:737
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:797
+#: nova/utils.py:803
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:931 nova/virt/configdrive.py:177
+#: nova/utils.py:937 nova/virt/configdrive.py:177
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/utils.py:1090
+#: nova/utils.py:1097
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1094
+#: nova/utils.py:1101
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1099
+#: nova/utils.py:1106
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1583,124 +1588,124 @@ msgstr ""
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:174
+#: nova/api/ec2/__init__.py:175
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:183
+#: nova/api/ec2/__init__.py:184
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:202
+#: nova/api/ec2/__init__.py:203
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:206
+#: nova/api/ec2/__init__.py:207
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:241 nova/api/ec2/__init__.py:256
+#: nova/api/ec2/__init__.py:242 nova/api/ec2/__init__.py:257
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:255
+#: nova/api/ec2/__init__.py:256
 #, python-format
 msgid "Keystone failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:315
+#: nova/api/ec2/__init__.py:316
 msgid "Timestamp failed validation."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:335
+#: nova/api/ec2/__init__.py:336
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:337
+#: nova/api/ec2/__init__.py:338
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:413
+#: nova/api/ec2/__init__.py:414
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:487
+#: nova/api/ec2/__init__.py:488
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:493
+#: nova/api/ec2/__init__.py:494
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:499
+#: nova/api/ec2/__init__.py:500
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:505
+#: nova/api/ec2/__init__.py:506
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:514
+#: nova/api/ec2/__init__.py:515
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:519
+#: nova/api/ec2/__init__.py:520
 #, python-format
 msgid "InvalidKeypair raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:524
+#: nova/api/ec2/__init__.py:525
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:528
+#: nova/api/ec2/__init__.py:529
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:532
+#: nova/api/ec2/__init__.py:533
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:536
+#: nova/api/ec2/__init__.py:537
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:540
+#: nova/api/ec2/__init__.py:541
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:544
+#: nova/api/ec2/__init__.py:545
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553
+#: nova/api/ec2/__init__.py:554
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:554
+#: nova/api/ec2/__init__.py:555
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:556 nova/api/metadata/handler.py:136
+#: nova/api/ec2/__init__.py:557 nova/api/metadata/handler.py:136
 #: nova/api/metadata/handler.py:187
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
@@ -1710,261 +1715,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:402
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:416
+#: nova/api/ec2/cloud.py:427
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:444
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:440 nova/api/ec2/cloud.py:459
+#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 #: nova/api/openstack/compute/plugins/v3/keypairs.py:94
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:449
+#: nova/api/ec2/cloud.py:460
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:469
+#: nova/api/ec2/cloud.py:480
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:611 nova/api/ec2/cloud.py:731
+#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:616
+#: nova/api/ec2/cloud.py:627
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:623
+#: nova/api/ec2/cloud.py:634
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:653 nova/api/ec2/cloud.py:685
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:676
+#: nova/api/ec2/cloud.py:687
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:759
+#: nova/api/ec2/cloud.py:770
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:832
+#: nova/api/ec2/cloud.py:843
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:836 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:863
+#: nova/api/ec2/cloud.py:874
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:876
+#: nova/api/ec2/cloud.py:887
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:898
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916
+#: nova/api/ec2/cloud.py:927
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942 nova/api/ec2/cloud.py:999
-#: nova/api/ec2/cloud.py:1557 nova/api/ec2/cloud.py:1572
+#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
+#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1074
+#: nova/api/ec2/cloud.py:1085
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1234
+#: nova/api/ec2/cloud.py:1245
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1249
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1242
+#: nova/api/ec2/cloud.py:1253
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1258
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1250
+#: nova/api/ec2/cloud.py:1261
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1260
+#: nova/api/ec2/cloud.py:1271
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1279
 #: 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:1277
+#: nova/api/ec2/cloud.py:1288
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1280
+#: nova/api/ec2/cloud.py:1291
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1283
+#: nova/api/ec2/cloud.py:1294
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1302
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1307
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1299
+#: nova/api/ec2/cloud.py:1310
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1326
+#: nova/api/ec2/cloud.py:1337
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1375
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1368
+#: nova/api/ec2/cloud.py:1385
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1377
+#: nova/api/ec2/cloud.py:1395
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1386
+#: nova/api/ec2/cloud.py:1405
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1477
+#: nova/api/ec2/cloud.py:1496
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1493
+#: nova/api/ec2/cloud.py:1512
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1575
+#: nova/api/ec2/cloud.py:1594
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1577
+#: nova/api/ec2/cloud.py:1596
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1598
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1581
+#: nova/api/ec2/cloud.py:1600
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1613
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1622
+#: nova/api/ec2/cloud.py:1641
 #, 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:1653
+#: nova/api/ec2/cloud.py:1673
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1691
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1695 nova/api/ec2/cloud.py:1740
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1698 nova/api/ec2/cloud.py:1743
+#: nova/api/ec2/cloud.py:1719 nova/api/ec2/cloud.py:1764
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1702 nova/api/ec2/cloud.py:1747
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1705 nova/api/ec2/cloud.py:1750
+#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1783
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1835
+#: nova/api/ec2/cloud.py:1856
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2756,7 +2761,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:248
 #: nova/api/openstack/compute/contrib/console_output.py:45
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
-#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+#: nova/api/openstack/compute/contrib/server_start_stop.py:41
 msgid "Instance not found"
 msgstr ""
 
@@ -3072,7 +3077,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:377
+#: nova/cmd/manage.py:386
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3100,34 +3105,34 @@ msgstr ""
 msgid "'status' or 'maintenance_mode' needed for host update"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:205
+#: nova/api/openstack/compute/contrib/hosts.py:206
 #, python-format
 msgid "Putting host %(host_name)s in maintenance mode %(mode)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:211
+#: nova/api/openstack/compute/contrib/hosts.py:212
 msgid "Virt driver does not implement host maintenance mode."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:224
+#: nova/api/openstack/compute/contrib/hosts.py:227
 #, python-format
 msgid "Enabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:226
+#: nova/api/openstack/compute/contrib/hosts.py:229
 #, python-format
 msgid "Disabling host %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:231
+#: nova/api/openstack/compute/contrib/hosts.py:234
 msgid "Virt driver does not implement host disabled status."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:247
+#: nova/api/openstack/compute/contrib/hosts.py:250
 msgid "Virt driver does not implement host power management."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:333
+#: nova/api/openstack/compute/contrib/hosts.py:336
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
@@ -3262,18 +3267,35 @@ msgstr ""
 msgid "Create networks failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:69
+#: nova/api/openstack/compute/contrib/quotas.py:71
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:104
+#: nova/api/openstack/compute/contrib/quotas.py:123
+#, python-format
+msgid "Quota '%(value)s' for %(key)s should be integer."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:129
+#, python-format
+msgid "force update quotas: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:132
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/quotas.py:111
+#: nova/api/openstack/compute/contrib/quotas.py:152
 #, python-format
-msgid "Quota for %s should be integer."
+msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/quotas.py:157
+#, python-format
+msgid ""
+"Quota value %(value)s for %(key)s are greater than already used and "
+"reserved %(quota_used)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:38
@@ -3311,24 +3333,31 @@ msgstr ""
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#: nova/api/openstack/compute/contrib/server_start_stop.py:49
 msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:58
+#: nova/api/openstack/compute/contrib/server_start_stop.py:61
 msgid "stop instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:121
-#, fuzzy
-msgid "Unknown action"
-msgstr "發生一個未知例外"
+#: nova/api/openstack/compute/contrib/services.py:173
+msgid "Disabled reason contains invalid characters or is too long"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:180
+msgid "Invalid attribute in the request"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/services.py:182
+msgid "Missing disabled reason field"
+msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:135
+#: nova/api/openstack/compute/contrib/services.py:189
 msgid "Unknown service"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:226
+#: nova/api/openstack/compute/contrib/simple_tenant_usage.py:227
 msgid "Invalid start time. The start time cannot occur after the end time."
 msgstr ""
 
@@ -3565,30 +3594,30 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:68
+#: nova/cells/weights/mute_child.py:69
 #, python-format
 msgid ""
 "%(cell)s has not been seen since %(last_seen)s and is being treated as "
 "mute."
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:48
-msgid "Instance type for vpn instances"
+#: nova/cloudpipe/pipelib.py:50
+msgid "Flavor for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:51
+#: nova/cloudpipe/pipelib.py:53
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:54
+#: nova/cloudpipe/pipelib.py:56
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:57
+#: nova/cloudpipe/pipelib.py:59
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:126
+#: nova/cloudpipe/pipelib.py:128
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -3598,35 +3627,35 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "找不到Volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:236
+#: nova/cmd/baremetal_deploy_helper.py:243
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:244
+#: nova/cmd/baremetal_deploy_helper.py:251
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:248
+#: nova/cmd/baremetal_deploy_helper.py:255
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:156 nova/cmd/manage.py:1242
+#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:160 nova/cmd/manage.py:1246
+#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1262
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:162 nova/cmd/manage.py:1248
+#: nova/cmd/baremetal_manage.py:164 nova/cmd/manage.py:1264
 msgid "Please re-run nova-manage as root."
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:202 nova/cmd/manage.py:1293
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1309
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3647,312 +3676,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:202
+#: nova/cmd/manage.py:207
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: nova/cmd/manage.py:237
+#: nova/cmd/manage.py:242
 #, python-format
 msgid "%(key)s is not a valid quota key. Valid options are: %(options)s."
 msgstr ""
 
-#: nova/cmd/manage.py:243
+#: nova/cmd/manage.py:248
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:244
+#: nova/cmd/manage.py:249
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:245
+#: nova/cmd/manage.py:250
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:246
+#: nova/cmd/manage.py:251
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:286 nova/cmd/manage.py:357 nova/cmd/manage.py:681
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:294
+#: nova/cmd/manage.py:299
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:295
+#: nova/cmd/manage.py:300
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:296
+#: nova/cmd/manage.py:301
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:297 nova/cmd/manage.py:814
+#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:309 nova/cmd/manage.py:333
+#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:325
+#: nova/cmd/manage.py:330
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:384
+#: nova/cmd/manage.py:393
 #, python-format
 msgid ""
 "Too many IP addresses will be generated.  Please increase /%s to reduce "
 "the number generated."
 msgstr ""
 
-#: nova/cmd/manage.py:433
+#: nova/cmd/manage.py:444
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:495 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:496 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:497 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:498 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:499 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:500 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:501 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:502 nova/cmd/manage.py:608
+#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:503 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:510
+#: nova/cmd/manage.py:521
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:529
+#: nova/cmd/manage.py:540
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:534
+#: nova/cmd/manage.py:545
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:537
+#: nova/cmd/manage.py:548
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:600
+#: nova/cmd/manage.py:611
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:601
+#: nova/cmd/manage.py:612
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:602
+#: nova/cmd/manage.py:613
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:603
+#: nova/cmd/manage.py:614
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:604
+#: nova/cmd/manage.py:615
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:605
+#: nova/cmd/manage.py:616
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:606
+#: nova/cmd/manage.py:617
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:607
+#: nova/cmd/manage.py:618
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:609
+#: nova/cmd/manage.py:620
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:610 nova/cmd/manage.py:815
+#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:622
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:656
+#: nova/cmd/manage.py:667
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:657
+#: nova/cmd/manage.py:668
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:658
+#: nova/cmd/manage.py:669
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:659
+#: nova/cmd/manage.py:670
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:660
+#: nova/cmd/manage.py:671
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:661
+#: nova/cmd/manage.py:672
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:683
+#: nova/cmd/manage.py:694
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:696
+#: nova/cmd/manage.py:707
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:763
+#: nova/cmd/manage.py:774
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:764
+#: nova/cmd/manage.py:775
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:768
+#: nova/cmd/manage.py:779
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:769
+#: nova/cmd/manage.py:780
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:770
+#: nova/cmd/manage.py:781
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:771
+#: nova/cmd/manage.py:782
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:772
+#: nova/cmd/manage.py:783
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:854
+#: nova/cmd/manage.py:866
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:893
+#: nova/cmd/manage.py:905
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:897
+#: nova/cmd/manage.py:909
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:898
+#: nova/cmd/manage.py:910
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:900
+#: nova/cmd/manage.py:912
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:917
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:908
+#: nova/cmd/manage.py:920
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:916
+#: nova/cmd/manage.py:928
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:919
+#: nova/cmd/manage.py:931
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:924
+#: nova/cmd/manage.py:936
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:960
+#: nova/cmd/manage.py:972
 #, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr ""
 
-#: nova/cmd/manage.py:982
+#: nova/cmd/manage.py:994
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1026
+#: nova/cmd/manage.py:1040
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1067
+#: nova/cmd/manage.py:1081
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1069
+#: nova/cmd/manage.py:1083
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1095
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1085
+#: nova/cmd/manage.py:1099
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1094
+#: nova/cmd/manage.py:1108
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4005,54 +4034,54 @@ msgstr ""
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:562
+#: nova/compute/api.py:563
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/api.py:660
+#: nova/compute/api.py:661
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:804
+#: nova/compute/api.py:806
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:831
+#: nova/compute/api.py:833
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1114
+#: nova/compute/api.py:1116
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "建立虛擬介面失敗"
 
-#: nova/compute/api.py:1251
+#: nova/compute/api.py:1252
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1257
+#: nova/compute/api.py:1258
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1268
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1310
+#: nova/compute/api.py:1311
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1334
+#: nova/compute/api.py:1335
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1384
+#: nova/compute/api.py:1385
 msgid "Going to try to stop instance"
 msgstr ""
 
@@ -4060,152 +4089,152 @@ msgstr ""
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1474
+#: nova/compute/api.py:1473
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1711
+#: nova/compute/api.py:1710
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2045
+#: nova/compute/api.py:2046
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2054
+#: nova/compute/api.py:2055
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2100
+#: nova/compute/api.py:2103
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2237
+#: nova/compute/api.py:2241
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2342
+#: nova/compute/api.py:2346
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2350
+#: nova/compute/api.py:2354
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2426
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2536
+#: nova/compute/api.py:2540
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2558
+#: nova/compute/api.py:2562
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2566
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2808 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2812 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2818 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:2894
+#: nova/compute/api.py:2900
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2897
+#: nova/compute/api.py:2903
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2905
+#: nova/compute/api.py:2911
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2917
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2929
+#: nova/compute/api.py:2935
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2932
+#: nova/compute/api.py:2938
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2939
+#: nova/compute/api.py:2945
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2958
+#: nova/compute/api.py:2964
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "找不到Volume %s"
 
-#: nova/compute/api.py:3018
+#: nova/compute/api.py:3024
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "找不到Volume %s"
 
-#: nova/compute/api.py:3023
+#: nova/compute/api.py:3029
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3031
+#: nova/compute/api.py:3037
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3034
+#: nova/compute/api.py:3040
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3111 nova/compute/api.py:3185
+#: nova/compute/api.py:3117 nova/compute/api.py:3191
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3127
+#: nova/compute/api.py:3133
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3130
+#: nova/compute/api.py:3136
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3139
+#: nova/compute/api.py:3145
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3192
+#: nova/compute/api.py:3198
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4263,693 +4292,688 @@ msgid ""
 "requested %(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/flavors.py:90
+#: nova/compute/flavors.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/flavors.py:99
+#: nova/compute/flavors.py:101
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/flavors.py:108
+#: nova/compute/flavors.py:110
 #, python-format
 msgid "'%s' argument must be greater than or equal to 0"
 msgstr ""
 
-#: nova/compute/flavors.py:117
+#: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/flavors.py:130
+#: nova/compute/flavors.py:132
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/flavors.py:135
+#: nova/compute/flavors.py:137
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/flavors.py:145
+#: nova/compute/flavors.py:147
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:205
+#: nova/compute/manager.py:206
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:363
+#: nova/compute/manager.py:378
 #, python-format
-msgid "%(nodename)s is not a valid node managed by this compute host."
+msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:406
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:409
-#, python-format
-msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
-msgstr ""
-
-#: nova/compute/manager.py:425
-#, python-format
-msgid ""
-"Instance %(driver_instance)s found in the hypervisor, but not in the "
-"database"
-msgstr ""
-
-#: nova/compute/manager.py:446
+#: nova/compute/manager.py:455
 #, 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:461
+#: nova/compute/manager.py:471
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:482
+#: nova/compute/manager.py:492
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:498
 msgid "Failed to check if instance shared"
 msgstr ""
 
 #: nova/compute/manager.py:540
+#, python-format
+msgid ""
+"Error raised getting network info for instance %(instance_uuid)s. "
+"Retrying in %(retry_time)s seconds."
+msgstr ""
+
+#: nova/compute/manager.py:566
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:543
+#: nova/compute/manager.py:569
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:554
+#: nova/compute/manager.py:580
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:586
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:573
+#: nova/compute/manager.py:600
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:578
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:588
+#: nova/compute/manager.py:615
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:619
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:608
+#: nova/compute/manager.py:635
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:647
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:658
+#: nova/compute/manager.py:685
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:756
+#: nova/compute/manager.py:783
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:773
+#: nova/compute/manager.py:800
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:873
+#: nova/compute/manager.py:900
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:923
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:923 nova/compute/manager.py:2422
+#: nova/compute/manager.py:950 nova/compute/manager.py:2447
 #, python-format
-msgid "No node specified, defaulting to %(node)s"
+msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:994
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:978
+#: nova/compute/manager.py:1003
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1034
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1026
+#: nova/compute/manager.py:1051
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1051 nova/compute/manager.py:2476
+#: nova/compute/manager.py:1076 nova/compute/manager.py:2500
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1064
+#: nova/compute/manager.py:1089
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1069
+#: nova/compute/manager.py:1094
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1075
+#: nova/compute/manager.py:1100
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1129
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1139
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1174
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1151
+#: nova/compute/manager.py:1176
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1162
+#: nova/compute/manager.py:1187
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1206
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1232
+#: nova/compute/manager.py:1257
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1306
+#: nova/compute/manager.py:1331
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1313
+#: nova/compute/manager.py:1338
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1356
+#: nova/compute/manager.py:1381
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1359
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1391
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1439
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1476 nova/compute/manager.py:2658
-#: nova/compute/manager.py:4173
+#: nova/compute/manager.py:1501 nova/compute/manager.py:2682
+#: nova/compute/manager.py:4205
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1653
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1641
+#: nova/compute/manager.py:1666
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1645
+#: nova/compute/manager.py:1670
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1649
+#: nova/compute/manager.py:1674
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1757
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1764
+#: nova/compute/manager.py:1789
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "無法卸載 Volume %s"
 
-#: nova/compute/manager.py:1782
+#: nova/compute/manager.py:1807
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1807
+#: nova/compute/manager.py:1832
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1823
-#, fuzzy, python-format
-msgid "Cannot reboot instance: %(exc)s"
-msgstr "無法掛載Volume 到虛擬機器 %s"
+#: nova/compute/manager.py:1848
+#, python-format
+msgid "Cannot reboot instance: %s"
+msgstr ""
 
-#: nova/compute/manager.py:1836
+#: nova/compute/manager.py:1861
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1888
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1869
+#: nova/compute/manager.py:1894
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1930
+#: nova/compute/manager.py:1955
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1937
+#: nova/compute/manager.py:1963
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1942
+#: nova/compute/manager.py:1968
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1970
+#: nova/compute/manager.py:1996
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2003
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1984
+#: nova/compute/manager.py:2010
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1999
+#: nova/compute/manager.py:2025
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2006
+#: nova/compute/manager.py:2032
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2019
+#: nova/compute/manager.py:2045
 #, python-format
 msgid ""
-"trying to inject a file into a non-running (state: "
-"%(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: %(current_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2023
+#: nova/compute/manager.py:2050
 #, python-format
-msgid "injecting file to %(path)s"
+msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2070
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2083
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2075
+#: nova/compute/manager.py:2102
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:2079
+#: nova/compute/manager.py:2106
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2097
+#: nova/compute/manager.py:2124
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2118
+#: nova/compute/manager.py:2145
 #, python-format
-msgid "Changing instance metadata according to %(diff)r"
+msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2341
+#: nova/compute/manager.py:2366
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2375
+#: nova/compute/manager.py:2400
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2381
+#: nova/compute/manager.py:2406
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2403
+#: nova/compute/manager.py:2428
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2655
+#: nova/compute/manager.py:2679
 #, python-format
-msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2718
+#: nova/compute/manager.py:2742
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2760
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2799
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2830
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2850
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2830
+#: nova/compute/manager.py:2855
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2833
+#: nova/compute/manager.py:2858
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2850
+#: nova/compute/manager.py:2875
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2902
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2912
+#: nova/compute/manager.py:2937
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2959
+#: nova/compute/manager.py:2985
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3009
+#: nova/compute/manager.py:3036
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3046
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3033
+#: nova/compute/manager.py:3062
 #, 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:3063
+#: nova/compute/manager.py:3093
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3073
+#: nova/compute/manager.py:3104
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:3080
+#: nova/compute/manager.py:3111
 #, 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:3103
+#: nova/compute/manager.py:3135
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3139
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3159
+#: nova/compute/manager.py:3191
 #, python-format
-msgid "Port %(port_id)s is not attached"
+msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3205
 #, python-format
-msgid "Host %(host)s not found"
+msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3358
 #, python-format
-msgid "Pre live migration failed at  %(dest)s"
+msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3354
+#: nova/compute/manager.py:3386
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3409
+#: nova/compute/manager.py:3441
 #, python-format
-msgid "Migrating instance to %(dest)s finished successfully."
+msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3411
+#: nova/compute/manager.py:3443
 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:3426
+#: nova/compute/manager.py:3458
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3458
+#: nova/compute/manager.py:3490
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3587
+#: nova/compute/manager.py:3619
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3669
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3643
+#: nova/compute/manager.py:3674
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3652
+#: nova/compute/manager.py:3683
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3659
+#: nova/compute/manager.py:3691
 #, python-format
-msgid "Instance %(instance_uuid)s not found"
+msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3663
+#: nova/compute/manager.py:3696
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3670
+#: nova/compute/manager.py:3703
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3679
+#: nova/compute/manager.py:3714
 #, python-format
-msgid "Error auto-confirming resize: %(e)s. Will retry later."
+msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3696
+#: nova/compute/manager.py:3730
 #, 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:3715
+#: nova/compute/manager.py:3750
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3739
+#: nova/compute/manager.py:3774
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3843
+#: nova/compute/manager.py:3877
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3858
+#: nova/compute/manager.py:3891
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3885
+#: nova/compute/manager.py:3918
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3890 nova/compute/manager.py:3940
+#: nova/compute/manager.py:3925 nova/compute/manager.py:3974
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3927
+#: nova/compute/manager.py:3961
 #, 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:3965
+#: nova/compute/manager.py:3998
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3977 nova/compute/manager.py:3986
-#: nova/compute/manager.py:4016
+#: nova/compute/manager.py:4010 nova/compute/manager.py:4019
+#: nova/compute/manager.py:4049
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3981
+#: nova/compute/manager.py:4014
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3997
+#: nova/compute/manager.py:4030
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4003
+#: nova/compute/manager.py:4036
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4009
+#: nova/compute/manager.py:4042
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4025
+#: nova/compute/manager.py:4058
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4066
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4045
+#: nova/compute/manager.py:4079
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4072
+#: nova/compute/manager.py:4106
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4082 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4116 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4123
+#: nova/compute/manager.py:4156
 #, python-format
 msgid ""
-"Detected instance with name label '%(name)s' which is marked as DELETED "
-"but still present on host."
+"Detected instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4130
+#: nova/compute/manager.py:4162
 #, python-format
 msgid ""
-"Destroying instance with name label '%(name)s' which is marked as DELETED"
-" but still present on host."
+"Destroying instance with name label '%s' which is marked as DELETED but "
+"still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4137
+#: nova/compute/manager.py:4169
 #, python-format
-msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
+msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4164
+#: nova/compute/manager.py:4196
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5049,11 +5073,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:51
+#: nova/compute/rpcapi.py:53
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:54
+#: nova/compute/rpcapi.py:56
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5063,7 +5087,7 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:398
+#: nova/conductor/api.py:399
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
@@ -5156,11 +5180,11 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1548
+#: nova/db/api.py:1550
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1685
+#: nova/db/api.py:1690
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
@@ -5178,44 +5202,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:661
+#: nova/db/sqlalchemy/api.py:662
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:882
+#: nova/db/sqlalchemy/api.py:883
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1167 nova/db/sqlalchemy/api.py:1207
+#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
 #, python-format
 msgid "Invalid fixed IP Address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1344
+#: nova/db/sqlalchemy/api.py:1345
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1437
+#: nova/db/sqlalchemy/api.py:1438
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1572
+#: nova/db/sqlalchemy/api.py:1573
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2931
+#: nova/db/sqlalchemy/api.py:2927
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4461
+#: nova/db/sqlalchemy/api.py:4458
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5232,57 +5256,57 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:73
+#: nova/db/sqlalchemy/utils.py:77
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:79
+#: nova/db/sqlalchemy/utils.py:83
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:181
+#: nova/db/sqlalchemy/utils.py:210
 #, python-format
 msgid "Deleted duplicated row with id: %(id)s from table: %(table)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:215
+#: nova/db/sqlalchemy/utils.py:244
 #, python-format
 msgid "Missing column %(table)s.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:221
+#: nova/db/sqlalchemy/utils.py:250
 #, python-format
 msgid ""
 "Different types in %(table)s.%(column)s and shadow table: %(c_type)s "
 "%(shadow_c_type)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:230
+#: nova/db/sqlalchemy/utils.py:259
 #, python-format
 msgid "Extra column %(table)%.%(column)s in shadow table"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:250
+#: nova/db/sqlalchemy/utils.py:279
 msgid "Specify `table_name` or `table` param"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:253
+#: nova/db/sqlalchemy/utils.py:282
 msgid "Specify only one param `table_name` `table`"
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:275 nova/db/sqlalchemy/utils.py:279
+#: nova/db/sqlalchemy/utils.py:304 nova/db/sqlalchemy/utils.py:308
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:927
 #: nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py:58
 msgid "Exception while creating table."
 msgstr ""
 
-#: nova/db/sqlalchemy/utils.py:287
+#: nova/db/sqlalchemy/utils.py:316
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -5306,7 +5330,7 @@ msgid ""
 "%(extra)s."
 msgstr ""
 
-#: nova/image/glance.py:495
+#: nova/image/glance.py:496
 #, python-format
 msgid "fetching image %s from glance"
 msgstr ""
@@ -5476,23 +5500,23 @@ msgstr ""
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/ldapdns.py:100
+#: nova/network/ldapdns.py:102
 #, python-format
 msgid ""
 "Found multiple matches for domain %(domain)s.\n"
 "%(entry)s"
 msgstr ""
 
-#: nova/network/ldapdns.py:127
+#: nova/network/ldapdns.py:129
 #, python-format
 msgid "Unable to dequalify.  %(name)s is not in %(domain)s.\n"
 msgstr ""
 
-#: nova/network/ldapdns.py:322
+#: nova/network/ldapdns.py:325
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/ldapdns.py:365
+#: nova/network/ldapdns.py:368
 msgid "This shouldn't be getting called except during testing."
 msgstr ""
 
@@ -5517,109 +5541,109 @@ msgstr ""
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:680
+#: nova/network/linux_net.py:681
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:730
+#: nova/network/linux_net.py:731
 #, python-format
 msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
 msgstr ""
 
-#: nova/network/linux_net.py:778
+#: nova/network/linux_net.py:779
 #, python-format
 msgid "Error deleting conntrack entries for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:979
+#: nova/network/linux_net.py:980
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1024
+#: nova/network/linux_net.py:1025
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1026
+#: nova/network/linux_net.py:1027
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1106
+#: nova/network/linux_net.py:1107
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1108
+#: nova/network/linux_net.py:1109
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1284
+#: nova/network/linux_net.py:1285
 #, python-format
 msgid "Net device removed: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1287
+#: nova/network/linux_net.py:1288
 #, python-format
 msgid "Failed removing net device: '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1405
+#: nova/network/linux_net.py:1406
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1451
+#: nova/network/linux_net.py:1452
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1463
+#: nova/network/linux_net.py:1464
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1499
+#: nova/network/linux_net.py:1500
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1736
+#: nova/network/linux_net.py:1737
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1744
+#: nova/network/linux_net.py:1745
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:365
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:369
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:480
+#: nova/network/manager.py:481
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:487
+#: nova/network/manager.py:488
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:801
+#: nova/network/manager.py:803
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -5627,98 +5651,98 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:829
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:879
+#: nova/network/manager.py:881
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 
-#: nova/network/manager.py:911
+#: nova/network/manager.py:913
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:934
+#: nova/network/manager.py:936
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:938
+#: nova/network/manager.py:940
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:947
+#: nova/network/manager.py:949
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:954
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:958
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:960
+#: nova/network/manager.py:962
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:979
+#: nova/network/manager.py:981
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1003
+#: nova/network/manager.py:1005
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1023
+#: nova/network/manager.py:1025
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1105
+#: nova/network/manager.py:1107
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1108
+#: nova/network/manager.py:1110
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1119
+#: nova/network/manager.py:1121
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1176
+#: nova/network/manager.py:1178
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1195
+#: nova/network/manager.py:1197
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1795
+#: nova/network/manager.py:1794
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1802
+#: nova/network/manager.py:1801
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -5847,7 +5871,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:127
 #: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:262
+#: nova/network/security_group/quantum_driver.py:263
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5860,45 +5884,45 @@ msgstr ""
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:191
+#: nova/network/security_group/quantum_driver.py:192
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:195
-#: nova/network/security_group/quantum_driver.py:360
-#: nova/network/security_group/quantum_driver.py:366
-#: nova/network/security_group/quantum_driver.py:393
-#: nova/network/security_group/quantum_driver.py:408
-#: nova/network/security_group/quantum_driver.py:414
-#: nova/network/security_group/quantum_driver.py:443
+#: 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
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:249
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:259
+#: nova/network/security_group/quantum_driver.py:260
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:376
+#: nova/network/security_group/quantum_driver.py:374
 #, 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:386
-#: nova/network/security_group/quantum_driver.py:436
+#: nova/network/security_group/quantum_driver.py:384
+#: nova/network/security_group/quantum_driver.py:434
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:446
+#: nova/network/security_group/quantum_driver.py:444
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5919,12 +5943,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:199
+#: nova/objects/base.py:201
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:301
+#: nova/objects/base.py:303
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6624,7 +6648,7 @@ msgstr ""
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:222
+#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
@@ -6742,7 +6766,7 @@ msgstr ""
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:208
+#: nova/scheduler/manager.py:211
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6781,7 +6805,7 @@ msgstr ""
 msgid "%(host_state)s fails tenant id on aggregate"
 msgstr ""
 
-#: nova/scheduler/filters/compute_capabilities_filter.py:57
+#: nova/scheduler/filters/compute_capabilities_filter.py:58
 #, python-format
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
@@ -7038,71 +7062,71 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3488
+#: nova/tests/api/openstack/compute/test_servers.py:3489
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3491
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3493
+#: nova/tests/api/openstack/compute/test_servers.py:3494
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3496
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3498
+#: nova/tests/api/openstack/compute/test_servers.py:3499
 #: nova/tests/api/openstack/compute/plugins/v3/test_servers.py:3501
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1099
-#: nova/tests/compute/test_compute.py:1117
-#: nova/tests/compute/test_compute.py:1168
-#: nova/tests/compute/test_compute.py:1195
-#: nova/tests/compute/test_compute.py:1241
-#: nova/tests/compute/test_compute.py:4032
+#: 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:4087
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1105
-#: nova/tests/compute/test_compute.py:1140
-#: nova/tests/compute/test_compute.py:1183
-#: nova/tests/compute/test_compute.py:1213
+#: 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
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1723
+#: nova/tests/compute/test_compute.py:1777
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4043
+#: nova/tests/compute/test_compute.py:4098
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4543
+#: nova/tests/compute/test_compute.py:4598
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9144
+#: nova/tests/compute/test_compute.py:9363
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1755
+#: nova/tests/db/test_migrations.py:1772
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:181
+#: nova/tests/integrated/test_api_samples.py:183
 #, python-format
 msgid "%(result_str)s: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid ""
 "Dictionary key mismatch:\n"
@@ -7112,22 +7136,22 @@ msgid ""
 "%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:206
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid "%(result_str)s: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:225
+#: nova/tests/integrated/test_api_samples.py:227
 msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:229
+#: nova/tests/integrated/test_api_samples.py:231
 #, python-format
 msgid "Extra list items in %(result_str)s:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:250
-#: nova/tests/integrated/test_api_samples.py:265
+#: nova/tests/integrated/test_api_samples.py:252
+#: nova/tests/integrated/test_api_samples.py:267
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -7193,36 +7217,36 @@ msgstr ""
 msgid "fake vswitch not found"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:892
+#: nova/tests/virt/libvirt/fakelibvirt.py:893
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:896
+#: nova/tests/virt/libvirt/fakelibvirt.py:897
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:900
+#: nova/tests/virt/libvirt/fakelibvirt.py:901
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/virt/libvirt/fakelibvirt.py:904
+#: nova/tests/virt/libvirt/fakelibvirt.py:905
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
 #: nova/tests/virt/xenapi/test_vm_utils.py:370
-#: nova/virt/xenapi/vm_utils.py:2147
+#: nova/virt/xenapi/vm_utils.py:2183
 #, python-format
 msgid ""
 "Sparse copy in progress, %(complete_pct).2f%% complete. %(left) bytes "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:898
+#: nova/tests/virt/xenapi/test_xenapi.py:899
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:909
+#: nova/tests/virt/xenapi/test_xenapi.py:910
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7232,25 +7256,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:942
+#: nova/virt/driver.py:948
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:954
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:970
+#: nova/virt/driver.py:976
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:973
+#: nova/virt/driver.py:979
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:980
+#: nova/virt/driver.py:986
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7259,24 +7283,24 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:184 nova/virt/libvirt/firewall.py:305
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/firewall.py:195
+#: nova/virt/firewall.py:200
 msgid "Filters added to instance"
 msgstr ""
 
-#: nova/virt/firewall.py:197
+#: nova/virt/firewall.py:202
 msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#: nova/virt/firewall.py:377
+#: nova/virt/firewall.py:383
 #, python-format
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:511 nova/virt/xenapi/firewall.py:74
+#: nova/virt/firewall.py:517 nova/virt/xenapi/firewall.py:76
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -8049,16 +8073,16 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3867
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3923
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:159
+#: nova/virt/hyperv/hostops.py:161
 msgid "get_host_stats called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:174
+#: nova/virt/hyperv/hostops.py:176
 #, python-format
 msgid "Host IP address is: %s"
 msgstr ""
@@ -8401,12 +8425,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1880
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1909
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1887
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1916
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8565,7 +8589,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:909
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:938
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8584,251 +8608,261 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:127
+#: nova/virt/libvirt/blockinfo.py:129
 #, python-format
 msgid "Unable to determine disk prefix for %s"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:174
+#: nova/virt/libvirt/blockinfo.py:177
 #, python-format
 msgid "No free disk device names for prefix '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/blockinfo.py:264
+#: nova/virt/libvirt/blockinfo.py:269
 #, python-format
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:351
+#: nova/virt/libvirt/driver.py:354
 #, python-format
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:558
+#: nova/virt/libvirt/driver.py:567
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:566
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:583
+#: nova/virt/libvirt/driver.py:596
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:599
+#: nova/virt/libvirt/driver.py:606
+#, python-format
+msgid "URI %s does not support connection events"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:616
+#, python-format
+msgid "Connection to libvirt lost: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:629
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:621 nova/virt/libvirt/driver.py:624
+#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:642
+#: nova/virt/libvirt/driver.py:672
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "連接到glance失敗"
 
-#: nova/virt/libvirt/driver.py:734
+#: nova/virt/libvirt/driver.py:763
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:749
+#: nova/virt/libvirt/driver.py:778
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:754
+#: nova/virt/libvirt/driver.py:783
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:764
+#: nova/virt/libvirt/driver.py:793
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:774
+#: nova/virt/libvirt/driver.py:803
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:793
+#: nova/virt/libvirt/driver.py:822
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:809
+#: nova/virt/libvirt/driver.py:838
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:829
+#: nova/virt/libvirt/driver.py:858
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:835
+#: nova/virt/libvirt/driver.py:864
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:863
+#: nova/virt/libvirt/driver.py:892
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:901
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:915
+#: nova/virt/libvirt/driver.py:944
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:922
+#: nova/virt/libvirt/driver.py:951
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:927
+#: nova/virt/libvirt/driver.py:956
 msgid "No Volume Connector found."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1049
+#: nova/virt/libvirt/driver.py:1078
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1073
+#: nova/virt/libvirt/driver.py:1102
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1122
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1097
+#: nova/virt/libvirt/driver.py:1126
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1212
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1215
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1215
+#: nova/virt/libvirt/driver.py:1244
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1256
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1300
+#: nova/virt/libvirt/driver.py:1329
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1304
+#: nova/virt/libvirt/driver.py:1333
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339
+#: nova/virt/libvirt/driver.py:1368
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1347
+#: nova/virt/libvirt/driver.py:1376
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1395
+#: nova/virt/libvirt/driver.py:1424
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1541
+#: nova/virt/libvirt/driver.py:1570
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1548 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1577 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1593
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1601 nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1630 nova/virt/libvirt/driver.py:1656
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1616
+#: nova/virt/libvirt/driver.py:1645 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "使用者並沒有管理者權力"
 
-#: nova/virt/libvirt/driver.py:1685
+#: nova/virt/libvirt/driver.py:1714
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1689
+#: nova/virt/libvirt/driver.py:1718
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1694 nova/virt/libvirt/driver.py:1699
+#: nova/virt/libvirt/driver.py:1723 nova/virt/libvirt/driver.py:1728
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1770
+#: nova/virt/libvirt/driver.py:1799
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1920
+#: nova/virt/libvirt/driver.py:1949
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1930
+#: nova/virt/libvirt/driver.py:1959
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1987
+#: nova/virt/libvirt/driver.py:2018
 #, 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:1993
+#: nova/virt/libvirt/driver.py:2024
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1997
+#: nova/virt/libvirt/driver.py:2028
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2001
+#: nova/virt/libvirt/driver.py:2032
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2017
+#: nova/virt/libvirt/driver.py:2048
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2341
+#: nova/virt/libvirt/driver.py:2372
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8836,73 +8870,75 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2373
+#: nova/virt/libvirt/driver.py:2404
+#, 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:2425
 #, 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:2552 nova/virt/libvirt/driver.py:2556
+#: nova/virt/libvirt/driver.py:2525 nova/virt/libvirt/driver.py:2716
+#, python-format
+msgid "libvirt can't find a domain with id: %s"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:2607 nova/virt/libvirt/driver.py:2611
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2565
+#: nova/virt/libvirt/driver.py:2620
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2627
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2577
+#: nova/virt/libvirt/driver.py:2632
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2594
+#: nova/virt/libvirt/driver.py:2649
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2604
+#: nova/virt/libvirt/driver.py:2659
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2656
+#: nova/virt/libvirt/driver.py:2711
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2662
-#, python-format
-msgid "List of domains returned by libVirt: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2664
-#, python-format
-msgid "libVirt can't find a domain with id: %s"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:2728
+#: nova/virt/libvirt/driver.py:2778
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2812
+#: nova/virt/libvirt/driver.py:2863
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "無法卸載 Volume %s"
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2876
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8910,50 +8946,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2843
+#: nova/virt/libvirt/driver.py:2894
 #, 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:2848
+#: nova/virt/libvirt/driver.py:2899
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2925
+#: nova/virt/libvirt/driver.py:2976
 #, 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:3006
+#: nova/virt/libvirt/driver.py:3057
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3014
+#: nova/virt/libvirt/driver.py:3065
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3059
+#: nova/virt/libvirt/driver.py:3110
 #, 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:3084
+#: nova/virt/libvirt/driver.py:3135
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3096
+#: nova/virt/libvirt/driver.py:3147
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8963,67 +8999,67 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3113
+#: nova/virt/libvirt/driver.py:3164
 #, 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:3161
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3233
+#: nova/virt/libvirt/driver.py:3286
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3335
+#: nova/virt/libvirt/driver.py:3388
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3447
+#: nova/virt/libvirt/driver.py:3500
 #, 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:3464
+#: nova/virt/libvirt/driver.py:3517
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3469
+#: nova/virt/libvirt/driver.py:3522
 #, python-format
 msgid "skipping disk for %(instance_name)s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3510
+#: nova/virt/libvirt/driver.py:3563
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3579
+#: nova/virt/libvirt/driver.py:3633
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3647
+#: nova/virt/libvirt/driver.py:3701
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3707
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3717
+#: nova/virt/libvirt/driver.py:3772
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3840
+#: nova/virt/libvirt/driver.py:3895
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -9034,25 +9070,25 @@ msgid ""
 "correctly."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:107
+#: nova/virt/libvirt/firewall.py:108
 msgid "Called setup_basic_filtering in nwfilter"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:115
+#: nova/virt/libvirt/firewall.py:116
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:247
+#: nova/virt/libvirt/firewall.py:248
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:270
+#: nova/virt/libvirt/firewall.py:271
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:286
+#: nova/virt/libvirt/firewall.py:287
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9239,7 +9275,7 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:566
+#: nova/virt/libvirt/utils.py:567
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -9276,14 +9312,14 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:501
+#: nova/virt/libvirt/vif.py:502
 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:527
+#: nova/virt/libvirt/vif.py:529
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9291,7 +9327,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:555
+#: nova/virt/libvirt/vif.py:558
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9299,7 +9335,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:583
+#: nova/virt/libvirt/vif.py:587
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9307,7 +9343,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:609
+#: nova/virt/libvirt/vif.py:614
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9315,87 +9351,87 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:238
+#: nova/virt/libvirt/volume.py:240
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:241
+#: nova/virt/libvirt/volume.py:243
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(disk_dev)s. Will rescan & retry.  Try "
 "number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:254
+#: nova/virt/libvirt/volume.py:256
 #, python-format
 msgid "Found iSCSI node %(disk_dev)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:512 nova/virt/libvirt/volume.py:633
+#: nova/virt/libvirt/volume.py:514 nova/virt/libvirt/volume.py:635
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:560
+#: nova/virt/libvirt/volume.py:562
 #, python-format
 msgid "AoE device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:562
+#: nova/virt/libvirt/volume.py:564
 #, python-format
 msgid "AoE volume not yet found at: %(aoedevpath)s. Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:577
+#: nova/virt/libvirt/volume.py:579
 #, python-format
 msgid "Found AoE device %(aoedevpath)s (after %(tries)s rediscover)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:704
+#: nova/virt/libvirt/volume.py:706
 msgid "We are unable to locate any Fibre Channel devices"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:713
+#: nova/virt/libvirt/volume.py:715
 #, python-format
 msgid "Looking for Fibre Channel dev %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:723
+#: nova/virt/libvirt/volume.py:725
 msgid "Fibre Channel device not found."
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:726
+#: nova/virt/libvirt/volume.py:728
 #, python-format
 msgid ""
 "Fibre volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:743
+#: nova/virt/libvirt/volume.py:745
 #, python-format
 msgid "Found Fibre Channel volume %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:752
+#: nova/virt/libvirt/volume.py:754
 #, python-format
 msgid "Multipath device discovered %(device)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:828
+#: nova/virt/libvirt/volume.py:831
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:839
+#: nova/virt/libvirt/volume.py:842
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:845
+#: nova/virt/libvirt/volume.py:848
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:860
+#: nova/virt/libvirt/volume.py:863
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
@@ -9501,26 +9537,26 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr "連接到glance失敗"
 
-#: nova/virt/powervm/driver.py:124
+#: nova/virt/powervm/driver.py:125
 msgid "In get_host_ip_addr"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:127
+#: nova/virt/powervm/driver.py:128
 #, python-format
 msgid "Attempting to resolve %s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:129
+#: nova/virt/powervm/driver.py:130
 #, python-format
 msgid "%(hostname)s was successfully resolved to %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:174
+#: nova/virt/powervm/driver.py:175
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:306
+#: nova/virt/powervm/driver.py:307
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9667,32 +9703,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:355
+#: nova/virt/vmwareapi/driver.py:349
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:457
+#: nova/virt/vmwareapi/driver.py:451
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:540
+#: nova/virt/vmwareapi/driver.py:534
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:576
+#: nova/virt/vmwareapi/driver.py:570
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:581
+#: nova/virt/vmwareapi/driver.py:575
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:585
+#: nova/virt/vmwareapi/driver.py:579
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9702,39 +9738,39 @@ msgstr ""
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:45 nova/virt/xenapi/fake.py:77
+#: nova/virt/vmwareapi/fake.py:46 nova/virt/xenapi/fake.py:79
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:133
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:492
+#: nova/virt/vmwareapi/fake.py:494
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494 nova/virt/vmwareapi/fake.py:669
+#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:557
+#: nova/virt/vmwareapi/fake.py:559
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:572
+#: nova/virt/vmwareapi/fake.py:574
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:575
+#: nova/virt/vmwareapi/fake.py:577
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:666
+#: nova/virt/vmwareapi/fake.py:670
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9743,17 +9779,17 @@ msgstr ""
 msgid "%(action)s %(host)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/host.py:63
+#: nova/virt/vmwareapi/host.py:64
 #, python-format
 msgid "Set maintenance mod on %(host)s to %(mode)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:112
+#: nova/virt/vmwareapi/io_util.py:118
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: nova/virt/vmwareapi/io_util.py:120
+#: nova/virt/vmwareapi/io_util.py:126
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
@@ -9774,7 +9810,7 @@ msgstr ""
 msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/read_write_util.py:142
+#: nova/virt/vmwareapi/read_write_util.py:145
 #, python-format
 msgid "Exception during HTTP connection close in VMwareHTTPWrite. Exception is %s"
 msgstr ""
@@ -9817,57 +9853,57 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:198
+#: nova/virt/vmwareapi/vmops.py:199
 msgid "Creating VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:206
+#: nova/virt/vmwareapi/vmops.py:207
 msgid "Created VM on the ESX host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:230
+#: nova/virt/vmwareapi/vmops.py:231
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:249
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:258
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
 msgid ""
 "Deleting the file %(vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:280
+#: nova/virt/vmwareapi/vmops.py:281
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:300
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to %(upload_vmdk_name)s on the "
 "ESX data store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid ""
 "Copying Virtual Disk of size %(vmdk_file_size_in_kb)s KB and adapter type"
@@ -9875,311 +9911,310 @@ msgid ""
 " type %(disk_type)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
+#: nova/virt/vmwareapi/vmops.py:336
 #, python-format
 msgid ""
 "Copied Virtual Disk of size %(vmdk_file_size_in_kb)s KB and type "
 "%(disk_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:414
+#: nova/virt/vmwareapi/vmops.py:415
 msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:420
+#: nova/virt/vmwareapi/vmops.py:421
 msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:466
+#: nova/virt/vmwareapi/vmops.py:464
 msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:476
+#: nova/virt/vmwareapi/vmops.py:474
 msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:521
+#: nova/virt/vmwareapi/vmops.py:519
 msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:532
 msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:543
+#: nova/virt/vmwareapi/vmops.py:541
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:557
+#: nova/virt/vmwareapi/vmops.py:555
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:568
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:611
+#: nova/virt/vmwareapi/vmops.py:606
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:618
+#: nova/virt/vmwareapi/vmops.py:613
 msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:621
+#: nova/virt/vmwareapi/vmops.py:616
 msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:623
+#: nova/virt/vmwareapi/vmops.py:618
 msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:627
+#: nova/virt/vmwareapi/vmops.py:622
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:671
-#: nova/virt/vmwareapi/vmops.py:964
-msgid "instance not present"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:645 nova/virt/vmwareapi/vmops.py:968
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:650 nova/virt/vmwareapi/vmops.py:973
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
 msgid "Destroyed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:652
+#: nova/virt/vmwareapi/vmops.py:641
 #, python-format
 msgid "In vmwareapi:vmops:delete, got this exception while destroying the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:690 nova/virt/vmwareapi/vmops.py:843
+#: nova/virt/vmwareapi/vmops.py:675 nova/virt/vmwareapi/vmops.py:821
 msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:695 nova/virt/vmwareapi/vmops.py:848
+#: nova/virt/vmwareapi/vmops.py:680 nova/virt/vmwareapi/vmops.py:826
 msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:684
 msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:702
+#: nova/virt/vmwareapi/vmops.py:687
 msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:704
+#: nova/virt/vmwareapi/vmops.py:689
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:717
+#: nova/virt/vmwareapi/vmops.py:702
 #, python-format
 msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:729
+#: nova/virt/vmwareapi/vmops.py:714
 #, python-format
 msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:734
+#: nova/virt/vmwareapi/vmops.py:719
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:742
+#: nova/virt/vmwareapi/vmops.py:727
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:746
+#: nova/virt/vmwareapi/vmops.py:731
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:760
+#: nova/virt/vmwareapi/vmops.py:742
 msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:764
+#: nova/virt/vmwareapi/vmops.py:746
 msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:767
+#: nova/virt/vmwareapi/vmops.py:749
 msgid "instance is powered off and cannot be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:770
+#: nova/virt/vmwareapi/vmops.py:752
 msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:783
+#: nova/virt/vmwareapi/vmops.py:762
 msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:788
+#: nova/virt/vmwareapi/vmops.py:767
 msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:790
+#: nova/virt/vmwareapi/vmops.py:769
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:851
+#: nova/virt/vmwareapi/vmops.py:829
 msgid "instance is suspended and cannot be powered off."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:854
+#: nova/virt/vmwareapi/vmops.py:832
 msgid "VM was already in powered off state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:867
+#: nova/virt/vmwareapi/vmops.py:843
 msgid "VM was already in powered on state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:871
+#: nova/virt/vmwareapi/vmops.py:847
 msgid "Powering on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:876
+#: nova/virt/vmwareapi/vmops.py:852
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:893
+#: nova/virt/vmwareapi/vmops.py:869
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:924
+#: nova/virt/vmwareapi/vmops.py:898
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:930
+#: nova/virt/vmwareapi/vmops.py:904
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:945
+#: nova/virt/vmwareapi/vmops.py:919
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:953
+#: nova/virt/vmwareapi/vmops.py:927
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:975
+#: nova/virt/vmwareapi/vmops.py:940
+msgid "instance not present"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:951
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:990
+#: nova/virt/vmwareapi/vmops.py:966
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:996
+#: nova/virt/vmwareapi/vmops.py:972
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "找不到Volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:1022
+#: nova/virt/vmwareapi/vmops.py:997
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1034
+#: nova/virt/vmwareapi/vmops.py:1009
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1044 nova/virt/xenapi/vmops.py:1377
+#: nova/virt/vmwareapi/vmops.py:1019 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:1048
+#: nova/virt/vmwareapi/vmops.py:1023
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1084
+#: nova/virt/vmwareapi/vmops.py:1057
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1166
+#: nova/virt/vmwareapi/vmops.py:1134
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1172
+#: nova/virt/vmwareapi/vmops.py:1140
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1186
+#: nova/virt/vmwareapi/vmops.py:1152
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1193
+#: nova/virt/vmwareapi/vmops.py:1159
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1286
+#: nova/virt/vmwareapi/vmops.py:1252
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1292
+#: nova/virt/vmwareapi/vmops.py:1258
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:91
+#: nova/virt/vmwareapi/vmware_images.py:92
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:107
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:113
+#: nova/virt/vmwareapi/vmware_images.py:114
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:140
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:150
+#: nova/virt/vmwareapi/vmware_images.py:151
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:155
+#: nova/virt/vmwareapi/vmware_images.py:156
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
@@ -10242,7 +10277,7 @@ msgstr ""
 msgid "Unable to discovered iSCSI target %(target_iqn)s from %(target_portal)s."
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:127 nova/virt/xenapi/volumeops.py:47
+#: nova/virt/vmwareapi/volumeops.py:127
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -10252,12 +10287,12 @@ msgstr ""
 msgid "Unable to find iSCSI Target"
 msgstr "找不到Volume %s"
 
-#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:57
+#: nova/virt/vmwareapi/volumeops.py:156 nova/virt/xenapi/volumeops.py:60
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:128
+#: nova/virt/vmwareapi/volumeops.py:166 nova/virt/xenapi/volumeops.py:132
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
@@ -10267,116 +10302,111 @@ msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
 msgid "Unable to find volume"
 msgstr "無法卸載 Volume %s"
 
-#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:147
+#: nova/virt/vmwareapi/volumeops.py:187 nova/virt/xenapi/volumeops.py:151
 #, python-format
 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:1619
+#: nova/virt/xenapi/agent.py:101 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:105 nova/virt/xenapi/vmops.py:1623
+#: nova/virt/xenapi/agent.py:106 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:110 nova/virt/xenapi/vmops.py:1628
+#: nova/virt/xenapi/agent.py:111 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:120
+#: nova/virt/xenapi/agent.py:123
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
-"path=%(path)s; args=%(args)r"
+"args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:130
+#: nova/virt/xenapi/agent.py:134
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
+msgid "Failed to query agent version: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:149
+#: nova/virt/xenapi/agent.py:153
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:163
+#: nova/virt/xenapi/agent.py:167
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:171
+#: nova/virt/xenapi/agent.py:175
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:179
+#: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %(resp)r"
+msgid "Failed to update agent: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:193
+#: nova/virt/xenapi/agent.py:197
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:204
-#, python-format
-msgid "Failed to exchange keys: %(resp)r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:224
+#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
 #, python-format
-msgid "Failed to update password: %(resp)r"
+msgid "Failed to exchange keys: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:245
+#: nova/virt/xenapi/agent.py:249
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:260
+#: nova/virt/xenapi/agent.py:264
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:273
+#: nova/virt/xenapi/agent.py:277
 #, python-format
-msgid "Failed to inject file: %(resp)r"
+msgid "Failed to inject file: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:280
+#: nova/virt/xenapi/agent.py:284
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:286
+#: nova/virt/xenapi/agent.py:290
 #, python-format
-msgid "Failed to reset network: %(resp)r"
+msgid "Failed to reset network: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:309
+#: nova/virt/xenapi/agent.py:313
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:317
+#: nova/virt/xenapi/agent.py:321
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:325
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:335
+#: nova/virt/xenapi/agent.py:339
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:388
+#: nova/virt/xenapi/agent.py:392
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10392,75 +10422,75 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:346
+#: nova/virt/xenapi/driver.py:348
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:562
+#: nova/virt/xenapi/driver.py:571
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:622
+#: nova/virt/xenapi/driver.py:632
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:672
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:687 nova/virt/xenapi/fake.py:791
-#: nova/virt/xenapi/fake.py:810 nova/virt/xenapi/fake.py:878
+#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
+#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:689
+#: nova/virt/xenapi/fake.py:707
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:723
+#: nova/virt/xenapi/fake.py:740
 #, python-format
-msgid "Calling %(localname)s %(impl)s"
+msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:728
+#: nova/virt/xenapi/fake.py:746
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:731
+#: nova/virt/xenapi/fake.py:749
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:793
+#: nova/virt/xenapi/fake.py:811
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:68
+#: nova/virt/xenapi/host.py:70
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:80
+#: nova/virt/xenapi/host.py:82
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
 #: nova/virt/xenapi/host.py:101
 #, python-format
-msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+msgid "Unable to migrate VM %(vm_ref)s from %(host)s"
 msgstr ""
 
 #: nova/virt/xenapi/host.py:185
@@ -10492,7 +10522,7 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -10501,37 +10531,37 @@ msgstr ""
 
 #: nova/virt/xenapi/pool.py:158
 #, python-format
-msgid "Unable to eject %(host)s from the pool; pool not empty"
+msgid "Unable to eject %s from the pool; pool not empty"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:175
 #, python-format
-msgid "Unable to eject %(host)s from the pool; No master found"
+msgid "Unable to eject %s from the pool; No master found"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:192
 #, python-format
-msgid "Pool-Join failed: %(e)s"
+msgid "Pool-Join failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:195
 #, python-format
-msgid "Unable to join %(host)s in the pool"
+msgid "Unable to join %s in the pool"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:211
 #, python-format
-msgid "Pool-eject failed: %(e)s"
+msgid "Pool-eject failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/pool.py:223
-#, fuzzy, python-format
-msgid "Unable to set up pool: %(e)s."
-msgstr "無法卸載 Volume %s"
+#, python-format
+msgid "Unable to set up pool: %s."
+msgstr ""
 
 #: nova/virt/xenapi/pool.py:234
 #, python-format
-msgid "Pool-set_name_label failed: %(e)s"
+msgid "Pool-set_name_label failed: %s"
 msgstr ""
 
 #: nova/virt/xenapi/vif.py:101
@@ -10542,7 +10572,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:120
 #, python-format
 msgid ""
-"PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
+"PIF %(pif_uuid)s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
@@ -10581,332 +10611,346 @@ msgstr ""
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:376
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:379
+#: nova/virt/xenapi/vm_utils.py:381
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:390
+#: nova/virt/xenapi/vm_utils.py:392
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:412
+#: nova/virt/xenapi/vm_utils.py:414
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:415
+#: nova/virt/xenapi/vm_utils.py:418
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:441
+#: nova/virt/xenapi/vm_utils.py:445
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:468
+#: nova/virt/xenapi/vm_utils.py:472
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:482
+#: nova/virt/xenapi/vm_utils.py:488
 msgid "SR not present and could not be introduced"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:507
+#: nova/virt/xenapi/vm_utils.py:513
 #, python-format
 msgid "block device info: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:593
+#: nova/virt/xenapi/vm_utils.py:599
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:638
+#: nova/virt/xenapi/vm_utils.py:645
 #, python-format
-msgid "No primary VDI found for %(vm_ref)s"
+msgid "No primary VDI found for %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:651
+#: nova/virt/xenapi/vm_utils.py:657
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:701
+#: nova/virt/xenapi/vm_utils.py:707
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:954
+#: nova/virt/xenapi/vm_utils.py:807
+msgid "Disk must have only one partition."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:815
+#, python-format
+msgid "Disk contains a filesystem we are unable to resize: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:824
+#, python-format
+msgid "Attempted auto_configure_disk failed because: %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:973
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
-"this system was found to be of type %(sr_type)s. Ignoring the cow flag."
+"this system was found to be of type %s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1010
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1044
+#: nova/virt/xenapi/vm_utils.py:1062
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1056
+#: nova/virt/xenapi/vm_utils.py:1075
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1069
+#: nova/virt/xenapi/vm_utils.py:1089
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1104
+#: nova/virt/xenapi/vm_utils.py:1124
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1115
+#: nova/virt/xenapi/vm_utils.py:1135
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image_id)s"
+msgid "Asking xapi to fetch vhd image %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1210
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1206
+#: nova/virt/xenapi/vm_utils.py:1228
 #, python-format
 msgid "Image size %(size)d exceeded instance_type allowed size %(allowed_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1252
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1243
+#: nova/virt/xenapi/vm_utils.py:1266
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1252
+#: nova/virt/xenapi/vm_utils.py:1276
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1271
+#: nova/virt/xenapi/vm_utils.py:1296
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1285
+#: nova/virt/xenapi/vm_utils.py:1310
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1319
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1335
+#: nova/virt/xenapi/vm_utils.py:1360
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1366
+#: nova/virt/xenapi/vm_utils.py:1391
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1384
+#: nova/virt/xenapi/vm_utils.py:1409
 #, python-format
 msgid ""
 "Image format is None: trying to determine PV status using pygrub; if "
 "instance with vdi %s does not boot correctly, try with image metadata."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1390
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
-msgid "Unknown image format %(disk_image_type)s"
+msgid "Unknown image format %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1421
+#: nova/virt/xenapi/vm_utils.py:1446
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1524
+#: nova/virt/xenapi/vm_utils.py:1549
 #, python-format
-msgid "Unable to parse rrd of %(vm_uuid)s"
+msgid "Unable to parse rrd of %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1551
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1605
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1597
+#: nova/virt/xenapi/vm_utils.py:1623
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1610
+#: nova/virt/xenapi/vm_utils.py:1636
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1618
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
-msgid "ISO: looking at SR %(sr_rec)s"
+msgid "ISO: looking at SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1620
+#: nova/virt/xenapi/vm_utils.py:1646
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1623
+#: nova/virt/xenapi/vm_utils.py:1649
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1626
+#: nova/virt/xenapi/vm_utils.py:1652
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1630
+#: nova/virt/xenapi/vm_utils.py:1656
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1632
+#: nova/virt/xenapi/vm_utils.py:1658
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1635
+#: nova/virt/xenapi/vm_utils.py:1661
 #, python-format
-msgid "ISO: PBD %(pbd_ref)s disappeared"
+msgid "ISO: PBD %s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1638
+#: nova/virt/xenapi/vm_utils.py:1664
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1641
+#: nova/virt/xenapi/vm_utils.py:1667
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1663
+#: nova/virt/xenapi/vm_utils.py:1689
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1679
+#: nova/virt/xenapi/vm_utils.py:1706
 #, python-format
-msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgid "Unable to obtain RRD XML updates with server details: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1733
+#: nova/virt/xenapi/vm_utils.py:1760
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1793
+#: nova/virt/xenapi/vm_utils.py:1820
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1880
+#: nova/virt/xenapi/vm_utils.py:1908
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1890
+#: nova/virt/xenapi/vm_utils.py:1920
 #, python-format
-msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgid "VHD coalesce attempts exceeded (%d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1925
+#: nova/virt/xenapi/vm_utils.py:1955
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1945
+#: nova/virt/xenapi/vm_utils.py:1975
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1958
+#: nova/virt/xenapi/vm_utils.py:1988
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1961
+#: nova/virt/xenapi/vm_utils.py:1991
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1963
+#: nova/virt/xenapi/vm_utils.py:1993
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1966
+#: nova/virt/xenapi/vm_utils.py:1997
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1971
+#: nova/virt/xenapi/vm_utils.py:2003
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1979
+#: nova/virt/xenapi/vm_utils.py:2011
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2006
+#: nova/virt/xenapi/vm_utils.py:2038
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2014
+#: nova/virt/xenapi/vm_utils.py:2046
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2016
+#: nova/virt/xenapi/vm_utils.py:2048
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2018
+#: nova/virt/xenapi/vm_utils.py:2050
 msgid ""
 "Error while executing pygrub! Please, ensure the binary is installed "
 "correctly, and available in your PATH; on some Linux distros, pygrub may "
@@ -10914,167 +10958,162 @@ msgid ""
 "mode."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2035
+#: nova/virt/xenapi/vm_utils.py:2067
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2041
+#: nova/virt/xenapi/vm_utils.py:2073
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2066
+#: nova/virt/xenapi/vm_utils.py:2099
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2079
+#: nova/virt/xenapi/vm_utils.py:2114
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2120
+#: nova/virt/xenapi/vm_utils.py:2155
 #, python-format
 msgid ""
 "Resize down not allowed because minimum filesystem sectors "
 "%(min_sectors)d is too big for target sectors %(new_sectors)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2162
+#: nova/virt/xenapi/vm_utils.py:2198
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2197
+#: nova/virt/xenapi/vm_utils.py:2234
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2249
+#: nova/virt/xenapi/vm_utils.py:2287
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2258
+#: nova/virt/xenapi/vm_utils.py:2296
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2370
+#: nova/virt/xenapi/vm_utils.py:2409
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:139 nova/virt/xenapi/vmops.py:804
+#: nova/virt/xenapi/vmops.py:141 nova/virt/xenapi/vmops.py:806
 #, python-format
-msgid "Updating progress to %(progress)d"
+msgid "Updating progress to %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:174
+#: nova/virt/xenapi/vmops.py:175
 #, python-format
 msgid "Importing image upload handler: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:189
+#: nova/virt/xenapi/vmops.py:190
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:308
+#: nova/virt/xenapi/vmops.py:309
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:394
+#: nova/virt/xenapi/vmops.py:395
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:467
+#: nova/virt/xenapi/vmops.py:468
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:499
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:593
+#: nova/virt/xenapi/vmops.py:594
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:639
+#: nova/virt/xenapi/vmops.py:640
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:645
+#: nova/virt/xenapi/vmops.py:646
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:659
+#: nova/virt/xenapi/vmops.py:660
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:662
+#: nova/virt/xenapi/vmops.py:663
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:673
+#: nova/virt/xenapi/vmops.py:674
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:704
+#: nova/virt/xenapi/vmops.py:705
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:715
+#: nova/virt/xenapi/vmops.py:716
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:773
+#: nova/virt/xenapi/vmops.py:774
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:778
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:785
+#: nova/virt/xenapi/vmops.py:787
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:811
+#: nova/virt/xenapi/vmops.py:813
 msgid "VM was already shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:815
+#: nova/virt/xenapi/vmops.py:817
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:819
+#: nova/virt/xenapi/vmops.py:821
 #, fuzzy
 msgid "Unable to terminate instance."
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/xenapi/vmops.py:824
-msgid "Resize down not allowed without auto_disk_config"
-msgstr ""
-
-#: nova/virt/xenapi/vmops.py:877
-msgid ""
-"_migrate_disk_resizing_down failed. Restoring orig vm due_to: "
-"%{exception}."
+#: nova/virt/xenapi/vmops.py:875
+#, python-format
+msgid "_migrate_disk_resizing_down failed. Restoring orig vm due_to: %s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:993
+#: nova/virt/xenapi/vmops.py:991
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -11083,114 +11122,112 @@ msgstr ""
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1042
+#: nova/virt/xenapi/vmops.py:1043
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1049
 msgid ""
 "Reboot failed due to bad volumes, detaching bad volumes and starting "
 "halted instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1142
+#: nova/virt/xenapi/vmops.py:1151
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1146
+#: nova/virt/xenapi/vmops.py:1155
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1182
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1189
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1187
+#: nova/virt/xenapi/vmops.py:1196
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1223
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1243
+#: nova/virt/xenapi/vmops.py:1252
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1294
+#: nova/virt/xenapi/vmops.py:1303
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1328
+#: nova/virt/xenapi/vmops.py:1337
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1381
+#: nova/virt/xenapi/vmops.py:1390
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1540
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1540
+#: nova/virt/xenapi/vmops.py:1562
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1549
+#: nova/virt/xenapi/vmops.py:1571
 #, python-format
-msgid "Creating VIF for network %(network_ref)s"
+msgid "Creating VIF for network %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1552
+#: nova/virt/xenapi/vmops.py:1574
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1580
+#: nova/virt/xenapi/vmops.py:1603
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1678
+#: nova/virt/xenapi/vmops.py:1707
 #, python-format
-msgid ""
-"Destination host:%(hostname)s must be in the same aggregate as the source"
-" server"
+msgid "Destination host:%s must be in the same aggregate as the source server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1699
+#: nova/virt/xenapi/vmops.py:1728
 msgid "No suitable network for migrate"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1711
+#: nova/virt/xenapi/vmops.py:1740
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1785
+#: nova/virt/xenapi/vmops.py:1814
 msgid "XAPI supporting relax-xsm-sr-check=true requried"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1796
+#: nova/virt/xenapi/vmops.py:1825
 msgid "VM.assert_can_migrate failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1849
+#: nova/virt/xenapi/vmops.py:1878
 msgid "Migrate Send failed"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:51
 #, python-format
-msgid "Creating SR %(label)s"
+msgid "Creating SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:61
 #, python-format
-msgid "Introducing SR %(label)s"
+msgid "Introducing SR %s"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:68
@@ -11239,24 +11276,24 @@ msgstr ""
 msgid "Cannot purge SR with referenced VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:202
+#: nova/virt/xenapi/volume_utils.py:202 nova/virt/xenapi/volume_utils.py:241
 #, python-format
-msgid "Unable to obtain target information %(mountpoint)s"
+msgid "Unable to obtain target information %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:241
+#: nova/virt/xenapi/volumeops.py:47
 #, python-format
-msgid "Unable to obtain target information %(connection_data)s"
+msgid "Attach_volume: %(connection_info)s, %(instance_name)s,\" %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:70
-#, fuzzy, python-format
-msgid "Connect_volume: %(connection_info)s"
-msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
+#: nova/virt/xenapi/volumeops.py:74
+#, python-format
+msgid "Connect_volume: %s"
+msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:139
+#: nova/virt/xenapi/volumeops.py:143
 #, python-format
-msgid "Skipping detach because VBD for %(instance_name)s was not found"
+msgid "Skipping detach because VBD for %s was not found"
 msgstr ""
 
 #: nova/virt/xenapi/imageupload/glance.py:69
@@ -11267,7 +11304,7 @@ msgid ""
 "%(attempt_num)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/imageupload/glance.py:82
+#: nova/virt/xenapi/imageupload/glance.py:87
 #, python-format
 msgid "upload_vhd failed: %r"
 msgstr ""
@@ -11320,8 +11357,212 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
+#~ msgid "Quota for %s should be integer."
+#~ msgstr ""
+
+#~ msgid "Unknown action"
+#~ msgstr "發生一個未知例外"
+
+#~ msgid "Instance type for vpn instances"
+#~ msgstr ""
+
+#~ msgid "%(nodename)s is not a valid node managed by this compute host."
+#~ msgstr ""
+
+#~ msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(driver_instance)s found in the "
+#~ "hypervisor, but not in the database"
+#~ msgstr ""
+
+#~ msgid "No node specified, defaulting to %(node)s"
+#~ msgstr ""
+
+#~ msgid "Cannot reboot instance: %(exc)s"
+#~ msgstr "無法掛載Volume 到虛擬機器 %s"
+
+#~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running (state: %(current_power_state)s "
+#~ "expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid "Changing instance metadata according to %(diff)r"
+#~ msgstr ""
+
+#~ msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
+#~ msgstr ""
+
+#~ msgid "Port %(port_id)s is not attached"
+#~ msgstr ""
+
+#~ msgid "Host %(host)s not found"
+#~ msgstr ""
+
+#~ msgid "Pre live migration failed at  %(dest)s"
+#~ msgstr ""
+
+#~ msgid "Migrating instance to %(dest)s finished successfully."
+#~ msgstr ""
+
+#~ msgid "Instance %(instance_uuid)s not found"
+#~ msgstr ""
+
+#~ msgid "Error auto-confirming resize: %(e)s. Will retry later."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Detected instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Destroying instance with name label "
+#~ "'%(name)s' which is marked as DELETED"
+#~ " but still present on host."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unrecognized value '%(action)s' for "
+#~ "CONF.running_deleted_instance_action"
+#~ msgstr ""
+
+#~ msgid "List of domains returned by libVirt: %s"
+#~ msgstr ""
+
+#~ msgid "libVirt can't find a domain with id: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The agent call to %(method)s returned"
+#~ " an invalid response: %(ret)r. "
+#~ "path=%(path)s; args=%(args)r"
+#~ msgstr ""
+
+#~ msgid "Failed to query agent version: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update agent: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to exchange keys: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to update password: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to inject file: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Failed to reset network: %(resp)r"
+#~ msgstr ""
+
+#~ msgid "Calling %(localname)s %(impl)s"
+#~ msgstr ""
+
+#~ msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; pool not empty"
+#~ msgstr ""
+
+#~ msgid "Unable to eject %(host)s from the pool; No master found"
+#~ msgstr ""
+
+#~ msgid "Pool-Join failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to join %(host)s in the pool"
+#~ msgstr ""
+
+#~ msgid "Pool-eject failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid "Unable to set up pool: %(e)s."
+#~ msgstr "無法卸載 Volume %s"
+
+#~ msgid "Pool-set_name_label failed: %(e)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "PIF %(pif_rec['uuid'])s for network %(bridge)s"
+#~ " has VLAN id %(pif_vlan)d. Expected "
+#~ "%(vlan_num)d"
+#~ msgstr ""
+
+#~ msgid "No primary VDI found for %(vm_ref)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Fast cloning is only supported on "
+#~ "default local SR of type ext. SR"
+#~ " on this system was found to be"
+#~ " of type %(sr_type)s. Ignoring the "
+#~ "cow flag."
+#~ msgstr ""
+
+#~ msgid "Asking xapi to fetch vhd image %(image_id)s"
+#~ msgstr ""
+
+#~ msgid "Unknown image format %(disk_image_type)s"
+#~ msgstr ""
+
+#~ msgid "Unable to parse rrd of %(vm_uuid)s"
+#~ msgstr ""
+
+#~ msgid "ISO: looking at SR %(sr_rec)s"
+#~ msgstr ""
+
+#~ msgid "ISO: PBD %(pbd_ref)s disappeared"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+#~ msgstr ""
+
+#~ msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+#~ msgstr ""
+
+#~ msgid "Updating progress to %(progress)d"
+#~ msgstr ""
+
+#~ msgid "Resize down not allowed without auto_disk_config"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_migrate_disk_resizing_down failed. Restoring orig"
+#~ " vm due_to: %{exception}."
+#~ msgstr ""
+
+#~ msgid "Creating VIF for network %(network_ref)s"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "The service from servicegroup driver "
-#~ "%(driver) is temporarily unavailable."
+#~ "Destination host:%(hostname)s must be in "
+#~ "the same aggregate as the source "
+#~ "server"
+#~ msgstr ""
+
+#~ msgid "Creating SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Introducing SR %(label)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(mountpoint)s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(connection_data)s"
+#~ msgstr ""
+
+#~ msgid "Connect_volume: %(connection_info)s"
+#~ msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
+
+#~ msgid "Skipping detach because VBD for %(instance_name)s was not found"
 #~ msgstr ""