From 45627a29d70c50a48421b0da2fdd963184617ddb Mon Sep 17 00:00:00 2001
From: OpenStack Jenkins <jenkins@openstack.org>
Date: Sun, 3 Mar 2013 00:03:35 +0000
Subject: Imported Translations from Transifex

Change-Id: I41e1e75771f15e65455874b7f48f23f5e162073d
---
 nova/locale/nova.pot | 1128 ++++++++++++++++++++++++++------------------------
 1 file changed, 585 insertions(+), 543 deletions(-)

diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 59ab07fe0..9093082b2 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.173\n"
+"Project-Id-Version: nova jenkins.nova.propose.translation.update.175\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-03-01 00:03+0000\n"
+"POT-Creation-Date: 2013-03-03 00:03+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"
@@ -175,7 +175,7 @@ msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
 #: nova/exception.py:234 nova/api/ec2/cloud.py:463
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2691
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2708
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -397,58 +397,63 @@ msgstr ""
 
 #: nova/exception.py:427
 #, python-format
-msgid "Unexpected argument for periodic task creation: %(arg)s."
+msgid "Invalid ID received %(id)s."
 msgstr ""
 
 #: nova/exception.py:431
+#, python-format
+msgid "Unexpected argument for periodic task creation: %(arg)s."
+msgstr ""
+
+#: nova/exception.py:435
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:440
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:445
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:453
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:457
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:461
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:465
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:469
+#: nova/exception.py:473
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:473
+#: nova/exception.py:477
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -456,802 +461,807 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:484
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:488
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:492
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:496
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:500
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:504
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:504
+#: nova/exception.py:508
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:508
+#: nova/exception.py:512
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:512
+#: nova/exception.py:516
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:516
+#: nova/exception.py:520
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:520
+#: nova/exception.py:524
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:524
+#: nova/exception.py:528
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:528
+#: nova/exception.py:532
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:537
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:541
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:545
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:549
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:553
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:557
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:561
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:565
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:570
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:574
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:580
+#: nova/exception.py:584
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:585
+#: nova/exception.py:589
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:589
+#: nova/exception.py:593
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:593
+#: nova/exception.py:597
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:606
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:610
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:614
+#: nova/exception.py:618
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:618
+#: nova/exception.py:622
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:622
+#: nova/exception.py:626
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:626
+#: nova/exception.py:630
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:635
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:664
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:668
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:672
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:676
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:680
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:684
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:688
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:693
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:697
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:705
+#: nova/exception.py:709
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:709
+#: nova/exception.py:713
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:713
+#: nova/exception.py:717
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:721
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:725
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:730
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:734
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:744
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:748
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:749
+#: nova/exception.py:753
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:758
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:762
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:767
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:771
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:773
+#: nova/exception.py:777
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:781
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:785
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:790
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:794
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:798
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:803
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:807
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:808
+#: nova/exception.py:812
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:816
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:820
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:824
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:836
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:840
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:844
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:848
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:853
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:857
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:858
+#: nova/exception.py:862
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:863
+#: nova/exception.py:867
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:868
+#: nova/exception.py:872
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:872
+#: nova/exception.py:876
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:880
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:909
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:909
+#: nova/exception.py:913
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:917
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:921
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:930
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:934
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:938
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:976
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:980
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:987
+#: nova/exception.py:991
 #, 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:992
+#: nova/exception.py:996
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1024
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1050
+#: nova/exception.py:1054
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
+#, python-format
+msgid "Info cache for instance %(instance_uuid)s could not be found."
+msgstr ""
+
+#: nova/exception.py:1073
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1077
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1081
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1085
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1080
+#: nova/exception.py:1089
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1084
+#: nova/exception.py:1093
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1088
+#: nova/exception.py:1097
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1092
+#: nova/exception.py:1101
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1096
+#: nova/exception.py:1105
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1101
+#: nova/exception.py:1110
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1115
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1119
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1123
 #, 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:1120
+#: nova/exception.py:1129
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1124
+#: nova/exception.py:1133
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1129
+#: nova/exception.py:1138
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1134
+#: nova/exception.py:1143
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1142
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1146
+#: nova/exception.py:1155
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1159
 #, python-format
 msgid "The service from servicegroup driver %(driver) is temporarily unavailable."
 msgstr ""
 
-#: nova/exception.py:1155
+#: nova/exception.py:1164
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1160
+#: nova/exception.py:1169
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1165
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
@@ -2791,7 +2801,7 @@ msgid ""
 "again in a few minutes"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe_update.py:44
+#: nova/api/openstack/compute/contrib/cloudpipe_update.py:43
 #, python-format
 msgid "Unknown action %s"
 msgstr ""
@@ -2874,12 +2884,12 @@ msgstr ""
 msgid "Error in evacuate, %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/fixed_ips.py:42
+#: nova/api/openstack/compute/contrib/fixed_ips.py:41
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/fixed_ips.py:74
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -2960,7 +2970,7 @@ msgstr ""
 msgid "Error. Unable to associate floating ip"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips_bulk.py:147
+#: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3312,34 +3322,34 @@ msgstr ""
 msgid "Got update for instance %(instance_uuid)s: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:782
+#: nova/cells/messaging.py:787
 #, python-format
 msgid "Got update to delete instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/cells/messaging.py:797
+#: nova/cells/messaging.py:802
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:811
+#: nova/cells/messaging.py:816
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:832
+#: nova/cells/messaging.py:837
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1009
+#: nova/cells/messaging.py:1014
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1029
+#: nova/cells/messaging.py:1034
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3431,207 +3441,202 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:436
+#: nova/compute/api.py:449
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:476
+#: nova/compute/api.py:489
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:589
+#: nova/compute/api.py:603
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:701
+#: nova/compute/api.py:716
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:728
+#: nova/compute/api.py:743
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1001
+#: nova/compute/api.py:1015
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1135
+#: nova/compute/api.py:1149
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1141
+#: nova/compute/api.py:1155
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1151
+#: nova/compute/api.py:1165
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1195
+#: nova/compute/api.py:1209
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1217
+#: nova/compute/api.py:1231
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1267
+#: nova/compute/api.py:1281
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1284
+#: nova/compute/api.py:1298
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1354
+#: nova/compute/api.py:1371
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1598
+#: nova/compute/api.py:1615
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1954
+#: nova/compute/api.py:1971
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1963
+#: nova/compute/api.py:1980
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2005
+#: nova/compute/api.py:2022
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2238
+#: nova/compute/api.py:2255
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2246
+#: nova/compute/api.py:2263
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2314
+#: nova/compute/api.py:2331
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2421
+#: nova/compute/api.py:2438
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2440
+#: nova/compute/api.py:2457
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2444
+#: nova/compute/api.py:2461
 #, python-format
 msgid ""
 "Instance compute service state on %(host)s expected to be down, but it "
 "was up."
 msgstr ""
 
-#: nova/compute/api.py:2664
+#: nova/compute/api.py:2681
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2668
+#: nova/compute/api.py:2685
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2773
+#: nova/compute/api.py:2790
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2776
+#: nova/compute/api.py:2793
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2784
+#: nova/compute/api.py:2801
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2790
+#: nova/compute/api.py:2807
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2810
+#: nova/compute/api.py:2827
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2813
+#: nova/compute/api.py:2830
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2820
+#: nova/compute/api.py:2837
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2885
+#: nova/compute/api.py:2902
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:2890
+#: nova/compute/api.py:2907
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2898
+#: nova/compute/api.py:2915
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2901
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3010 nova/compute/api.py:3087
+#: nova/compute/api.py:3012 nova/compute/api.py:3089
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3026
+#: nova/compute/api.py:3028
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3031
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3042
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3094
+#: nova/compute/api.py:3096
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/compute/api.py:3099
-#, python-format
-msgid "This rule already exists in group %s"
-msgstr ""
-
 #: nova/compute/claims.py:94 nova/compute/claims.py:218
 #, python-format
 msgid "Aborting claim: %s"
@@ -3722,573 +3727,586 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:350
+#: nova/compute/manager.py:354
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:383
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:402
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:416
+#: nova/compute/manager.py:420
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:437
+#: nova/compute/manager.py:441
 #, 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:464
+#: nova/compute/manager.py:478
+msgid "Failed to revert crashed migration"
+msgstr ""
+
+#: nova/compute/manager.py:481
+msgid "Instance found in migrating state during startup. Resetting task_state"
+msgstr ""
+
+#: nova/compute/manager.py:492
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:476
+#: nova/compute/manager.py:497
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:490
+#: nova/compute/manager.py:511
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:495
+#: nova/compute/manager.py:516
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:505
+#: nova/compute/manager.py:526
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:509
+#: nova/compute/manager.py:530
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:525
+#: nova/compute/manager.py:546
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:537
+#: nova/compute/manager.py:558
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:596
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:655
+#: nova/compute/manager.py:676
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:737 nova/compute/manager.py:2084
+#: nova/compute/manager.py:758 nova/compute/manager.py:2105
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:780
+#: nova/compute/manager.py:801
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:786
+#: nova/compute/manager.py:807
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:833
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:847 nova/compute/manager.py:2138
+#: nova/compute/manager.py:868 nova/compute/manager.py:2159
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:886
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:870
+#: nova/compute/manager.py:891
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:876
+#: nova/compute/manager.py:897
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:904
+#: nova/compute/manager.py:925
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:980
+#: nova/compute/manager.py:1001
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:986
+#: nova/compute/manager.py:1007
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:996
+#: nova/compute/manager.py:1017
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1021
+#: nova/compute/manager.py:1042
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1025
+#: nova/compute/manager.py:1046
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1056
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1073
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1097
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1152
+#: nova/compute/manager.py:1173
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1183
+#: nova/compute/manager.py:1204
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1186
+#: nova/compute/manager.py:1207
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1193
+#: nova/compute/manager.py:1214
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1218
+#: nova/compute/manager.py:1239
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1261 nova/compute/manager.py:2313
-#: nova/compute/manager.py:3746
+#: nova/compute/manager.py:1282 nova/compute/manager.py:2334
+#: nova/compute/manager.py:3769
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1401
+#: nova/compute/manager.py:1422
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1414
+#: nova/compute/manager.py:1435
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1418
+#: nova/compute/manager.py:1439
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1422
+#: nova/compute/manager.py:1443
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1506
+#: nova/compute/manager.py:1527
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1530
+#: nova/compute/manager.py:1551
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1549
+#: nova/compute/manager.py:1570
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1559
+#: nova/compute/manager.py:1580
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1595
+#: nova/compute/manager.py:1616
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1601
+#: nova/compute/manager.py:1622
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1662
+#: nova/compute/manager.py:1683
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1669
+#: nova/compute/manager.py:1690
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1674
+#: nova/compute/manager.py:1695
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1702
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1709
+#: nova/compute/manager.py:1730
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1716
+#: nova/compute/manager.py:1737
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1731
+#: nova/compute/manager.py:1752
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1759
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1751
+#: nova/compute/manager.py:1772
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1755
+#: nova/compute/manager.py:1776
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1775
+#: nova/compute/manager.py:1796
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:1789
+#: nova/compute/manager.py:1810
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1824
+#: nova/compute/manager.py:1845
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1845
+#: nova/compute/manager.py:1866
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2063
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2069
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2065
+#: nova/compute/manager.py:2086
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2310
+#: nova/compute/manager.py:2331
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2365
+#: nova/compute/manager.py:2386
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2383
+#: nova/compute/manager.py:2404
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2421
+#: nova/compute/manager.py:2442
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2452
+#: nova/compute/manager.py:2473
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2472
+#: nova/compute/manager.py:2493
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2477
+#: nova/compute/manager.py:2498
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2480
+#: nova/compute/manager.py:2501
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2497
+#: nova/compute/manager.py:2518
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2522
+#: nova/compute/manager.py:2543
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2571
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2590
+#: nova/compute/manager.py:2611
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2641
+#: nova/compute/manager.py:2662
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2650
+#: nova/compute/manager.py:2671
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2665
+#: nova/compute/manager.py:2686
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2695
+#: nova/compute/manager.py:2716
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2705
+#: nova/compute/manager.py:2726
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:2712
+#: nova/compute/manager.py:2733
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2736
+#: nova/compute/manager.py:2757
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:2792
+#: nova/compute/manager.py:2795
+#, python-format
+msgid "allocate_port_for_instance returned %(port)s ports"
+msgstr ""
+
+#: nova/compute/manager.py:2815
 #, python-format
 msgid "Port %(port_id)s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:2806
+#: nova/compute/manager.py:2829
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2935
+#: nova/compute/manager.py:2958
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2963
+#: nova/compute/manager.py:2986
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3018
+#: nova/compute/manager.py:3041
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3020
+#: nova/compute/manager.py:3043
 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:3034
+#: nova/compute/manager.py:3057
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3174
+#: nova/compute/manager.py:3197
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3242
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3225
+#: nova/compute/manager.py:3248
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3234
+#: nova/compute/manager.py:3257
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3241
+#: nova/compute/manager.py:3264
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3245
+#: nova/compute/manager.py:3268
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3252
+#: nova/compute/manager.py:3275
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3260
+#: nova/compute/manager.py:3283
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3277
+#: nova/compute/manager.py:3300
 #, 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:3296
+#: nova/compute/manager.py:3319
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3320
+#: nova/compute/manager.py:3343
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3438
+#: nova/compute/manager.py:3461
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3456
+#: nova/compute/manager.py:3479
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3482
+#: nova/compute/manager.py:3505
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3487 nova/compute/manager.py:3536
+#: nova/compute/manager.py:3510 nova/compute/manager.py:3559
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3523
+#: nova/compute/manager.py:3546
 #, 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:3561
+#: nova/compute/manager.py:3584
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3573 nova/compute/manager.py:3582
-#: nova/compute/manager.py:3612
+#: nova/compute/manager.py:3596 nova/compute/manager.py:3605
+#: nova/compute/manager.py:3635
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3577
+#: nova/compute/manager.py:3600
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3593
+#: nova/compute/manager.py:3616
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3599
+#: nova/compute/manager.py:3622
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3605
+#: nova/compute/manager.py:3628
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3621
+#: nova/compute/manager.py:3644
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3629
+#: nova/compute/manager.py:3652
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:3644
+#: nova/compute/manager.py:3667
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:3699
+#: nova/compute/manager.py:3722
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:3706
+#: nova/compute/manager.py:3729
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:3713
+#: nova/compute/manager.py:3736
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
@@ -4496,44 +4514,49 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:670 nova/db/api.py:691
+#: nova/db/api.py:665 nova/db/api.py:686
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:731
+#: nova/db/api.py:726
 msgid "Failed to notify cells of instance info cache update"
 msgstr ""
 
-#: nova/db/api.py:1454
+#: nova/db/api.py:1449
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1608
+#: nova/db/api.py:1603
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:152
+#: nova/db/sqlalchemy/api.py:153
 #, python-format
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:187
+#: nova/db/sqlalchemy/api.py:188
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:200 nova/virt/baremetal/db/sqlalchemy/api.py:64
+#: nova/db/sqlalchemy/api.py:201 nova/virt/baremetal/db/sqlalchemy/api.py:64
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1374
+#: nova/db/sqlalchemy/api.py:1375
 #, 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:2690
+#: nova/db/sqlalchemy/api.py:1511
+#, python-format
+msgid "Invalid instance id %s in request"
+msgstr ""
+
+#: nova/db/sqlalchemy/api.py:2677
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
@@ -4651,15 +4674,15 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:54 nova/network/api_deprecated.py:56
+#: nova/network/api.py:54
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:79 nova/network/api_deprecated.py:79
+#: nova/network/api.py:79
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:227 nova/network/api_deprecated.py:216
+#: nova/network/api.py:227 nova/network/api_deprecated.py:156
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -4790,101 +4813,106 @@ msgid ""
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:411
+#: nova/network/linux_net.py:419
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:668
+#: nova/network/linux_net.py:676
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:948
+#: nova/network/linux_net.py:726
+#, python-format
+msgid "Removed %(num)d duplicate rules for floating ip %(float)s"
+msgstr ""
+
+#: nova/network/linux_net.py:962
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:993
+#: nova/network/linux_net.py:1007
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:995
+#: nova/network/linux_net.py:1009
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:1070
+#: nova/network/linux_net.py:1084
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1072
+#: nova/network/linux_net.py:1086
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1204
+#: nova/network/linux_net.py:1218
 #, python-format
 msgid "Error clearing stale veth %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1363
+#: nova/network/linux_net.py:1377
 #, python-format
 msgid "Starting VLAN interface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1394
+#: nova/network/linux_net.py:1408
 #, python-format
 msgid "Failed unplugging VLAN interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1397
+#: nova/network/linux_net.py:1411
 #, python-format
 msgid "Unplugged VLAN interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1419
+#: nova/network/linux_net.py:1433
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1431
+#: nova/network/linux_net.py:1445
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1464
+#: nova/network/linux_net.py:1478
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1500
+#: nova/network/linux_net.py:1514
 #, python-format
 msgid "Failed unplugging bridge interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1503
+#: nova/network/linux_net.py:1517
 #, python-format
 msgid "Unplugged bridge interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1672
+#: nova/network/linux_net.py:1686
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1680
+#: nova/network/linux_net.py:1694
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1699
+#: nova/network/linux_net.py:1713
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1701
+#: nova/network/linux_net.py:1715
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
@@ -5065,49 +5093,49 @@ msgstr ""
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:304
+#: nova/network/quantumv2/api.py:311
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:313
+#: nova/network/quantumv2/api.py:320
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:330
+#: nova/network/quantumv2/api.py:337
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:353
+#: nova/network/quantumv2/api.py:360
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:383
+#: nova/network/quantumv2/api.py:390
 #, python-format
 msgid ""
 "Unable to update port %(portid)s on subnet %(subnet_id)s with failure: "
 "%(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:412
+#: nova/network/quantumv2/api.py:419
 #, python-format
 msgid "Unable to update port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:422
+#: nova/network/quantumv2/api.py:429
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:679
+#: nova/network/quantumv2/api.py:686
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:779
+#: nova/network/quantumv2/api.py:786
 #, python-format
 msgid "Network %(net)s for port %(port_id)s not found!"
 msgstr ""
@@ -5125,7 +5153,7 @@ msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:110
 #: nova/network/security_group/quantum_driver.py:154
-#: nova/network/security_group/quantum_driver.py:248
+#: nova/network/security_group/quantum_driver.py:244
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
@@ -5139,45 +5167,50 @@ msgid "Security group id should be uuid"
 msgstr ""
 
 #: nova/network/security_group/quantum_driver.py:176
-#: nova/network/security_group/quantum_driver.py:307
-#: nova/network/security_group/quantum_driver.py:313
-#: nova/network/security_group/quantum_driver.py:339
-#: nova/network/security_group/quantum_driver.py:355
-#: nova/network/security_group/quantum_driver.py:361
-#: nova/network/security_group/quantum_driver.py:390
+#: nova/network/security_group/quantum_driver.py:303
+#: nova/network/security_group/quantum_driver.py:309
+#: nova/network/security_group/quantum_driver.py:335
+#: nova/network/security_group/quantum_driver.py:351
+#: nova/network/security_group/quantum_driver.py:357
+#: nova/network/security_group/quantum_driver.py:386
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:233
+#: nova/network/security_group/quantum_driver.py:229
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:244
+#: nova/network/security_group/quantum_driver.py:240
 #, python-format
 msgid "Quantum Error getting security group rule %s."
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:323
+#: nova/network/security_group/quantum_driver.py:319
 #, 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:333
-#: nova/network/security_group/quantum_driver.py:383
+#: nova/network/security_group/quantum_driver.py:329
+#: nova/network/security_group/quantum_driver.py:379
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:393
+#: nova/network/security_group/quantum_driver.py:389
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
 "%(instance)s"
 msgstr ""
 
+#: nova/network/security_group/security_group_base.py:137
+#, python-format
+msgid "This rule already exists in group %s"
+msgstr ""
+
 #: nova/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -5218,12 +5251,12 @@ msgstr ""
 msgid "Deprecated: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:363
+#: nova/openstack/common/log.py:358
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/log.py:523
+#: nova/openstack/common/log.py:518
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -5709,7 +5742,7 @@ msgstr ""
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:333
+#: nova/scheduler/driver.py:335
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -5905,109 +5938,109 @@ msgstr ""
 msgid "least_cost has been deprecated in favor of the RAM Weigher."
 msgstr ""
 
-#: nova/servicegroup/api.py:61
+#: nova/servicegroup/api.py:60
 #, python-format
 msgid "ServiceGroup driver defined as an instance of %s"
 msgstr ""
 
-#: nova/servicegroup/api.py:67
+#: nova/servicegroup/api.py:66
 #, python-format
 msgid "unknown ServiceGroup driver name: %s"
 msgstr ""
 
-#: nova/servicegroup/api.py:84
+#: nova/servicegroup/api.py:83
 #, python-format
 msgid ""
 "Join new ServiceGroup member %(member_id)s to the %(group_id)s group, "
 "service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/api.py:91
+#: nova/servicegroup/api.py:90
 #, python-format
 msgid "Check if the given member [%s] is part of the ServiceGroup, is up"
 msgstr ""
 
-#: nova/servicegroup/api.py:100
+#: nova/servicegroup/api.py:99
 #, python-format
 msgid ""
 "Explicitly remove the given member %(member_id)s from the%(group_id)s "
 "group monitoring"
 msgstr ""
 
-#: nova/servicegroup/api.py:107
+#: nova/servicegroup/api.py:106
 #, python-format
 msgid "Returns ALL members of the [%s] ServiceGroup"
 msgstr ""
 
-#: nova/servicegroup/api.py:115
+#: nova/servicegroup/api.py:114
 #, python-format
 msgid "Returns one member of the [%s] group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:42
+#: nova/servicegroup/drivers/db.py:41
 #, python-format
 msgid ""
 "DB_Driver: join new ServiceGroup member %(member_id)s to the %(group_id)s"
 " group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:46
+#: nova/servicegroup/drivers/db.py:45
 msgid "service is a mandatory argument for DB based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:75
+#: nova/servicegroup/drivers/db.py:74
 #, python-format
 msgid "DB_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:98 nova/servicegroup/drivers/mc.py:103
+#: nova/servicegroup/drivers/db.py:97 nova/servicegroup/drivers/mc.py:102
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/servicegroup/drivers/db.py:104 nova/servicegroup/drivers/mc.py:109
+#: nova/servicegroup/drivers/db.py:103 nova/servicegroup/drivers/mc.py:108
 msgid "model server went away"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:45
+#: nova/servicegroup/drivers/mc.py:44
 msgid "memcached_servers not defined"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:53
+#: nova/servicegroup/drivers/mc.py:52
 #, python-format
 msgid ""
 "Memcached_Driver: join new ServiceGroup member %(member_id)s to the "
 "%(group_id)s group, service = %(service)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:58
+#: nova/servicegroup/drivers/mc.py:57
 msgid "service is a mandatory argument for Memcached based ServiceGroup driver"
 msgstr ""
 
-#: nova/servicegroup/drivers/mc.py:78
+#: nova/servicegroup/drivers/mc.py:77
 #, python-format
 msgid "Memcached_Driver: get_all members of the %s group"
 msgstr ""
 
-#: nova/servicegroup/drivers/zk.py:82
+#: nova/servicegroup/drivers/zk.py:80
 #, python-format
 msgid ""
 "ZooKeeperDriver: join new member %(id)s to the %(gr)s group, "
 "service=%(sr)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/zk.py:92
+#: nova/servicegroup/drivers/zk.py:90
 msgid ""
 "Unable to join. It is possible that either another node exists with the "
 "same name, or this node just restarted. We will try again in a short "
 "while to make sure."
 msgstr ""
 
-#: nova/servicegroup/drivers/zk.py:103
+#: nova/servicegroup/drivers/zk.py:101
 #, python-format
 msgid "ZooKeeperDriver.leave: %(member)s from group %(group)s"
 msgstr ""
 
-#: nova/servicegroup/drivers/zk.py:111
+#: nova/servicegroup/drivers/zk.py:109
 #, python-format
 msgid "ZooKeeperDriver.leave: %(id)s has not joined to the %(gr)s group"
 msgstr ""
@@ -6157,17 +6190,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3218
+#: nova/tests/api/openstack/compute/test_servers.py:3212
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3223
+#: nova/tests/api/openstack/compute/test_servers.py:3217
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:3228
+#: nova/tests/api/openstack/compute/test_servers.py:3222
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -6206,34 +6239,36 @@ msgstr ""
 msgid "Result: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:179
+#: nova/tests/integrated/test_api_samples.py:187
 #, python-format
 msgid ""
-"Key mismatch:\n"
-"%(ex_keys)s\n"
-"%(res_keys)s"
+"Dictionary key mismatch:\n"
+"Extra key(s) in template:\n"
+"%(ex_delta)s\n"
+"Extra key(s) in response:\n"
+"%(res_delta)s\n"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:187
+#: nova/tests/integrated/test_api_samples.py:197
 #, python-format
 msgid "Result: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:205
-msgid "Extra items in expected:"
+#: nova/tests/integrated/test_api_samples.py:215
+msgid "Extra list items in template:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:209
-msgid "Extra items in result:"
+#: nova/tests/integrated/test_api_samples.py:219
+msgid "Extra list items in response:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:228
-#: nova/tests/integrated/test_api_samples.py:241
+#: nova/tests/integrated/test_api_samples.py:238
+#: nova/tests/integrated/test_api_samples.py:252
 #, python-format
 msgid ""
 "Values do not match:\n"
-"%(expected)s\n"
-"%(result)s"
+"Template: %(expected)s\n"
+"Response: %(result)s"
 msgstr ""
 
 #: nova/tests/integrated/test_login.py:31
@@ -6482,32 +6517,32 @@ msgstr ""
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:450
+#: nova/virt/baremetal/pxe.py:459
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:457
+#: nova/virt/baremetal/pxe.py:466
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:462
+#: nova/virt/baremetal/pxe.py:471
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:475
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:468
+#: nova/virt/baremetal/pxe.py:477
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:473
+#: nova/virt/baremetal/pxe.py:482
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
@@ -7025,23 +7060,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:147
+#: nova/virt/hyperv/driver.py:150
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:153
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:156
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:157
+#: nova/virt/hyperv/driver.py:160
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:188
+#: nova/virt/hyperv/driver.py:191
 msgid "get_console_output called"
 msgstr ""
 
@@ -7054,7 +7089,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3641
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3663
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -7095,9 +7130,16 @@ msgstr ""
 msgid "post_live_migration_at_destination called"
 msgstr ""
 
-#: nova/virt/hyperv/livemigrationops.py:80
-#, python-format
-msgid "compare_cpu called %s"
+#: nova/virt/hyperv/livemigrationops.py:83
+msgid "check_can_live_migrate_destination called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:88
+msgid "check_can_live_migrate_destination_cleanup called"
+msgstr ""
+
+#: nova/virt/hyperv/livemigrationops.py:92
+msgid "check_can_live_migrate_source called"
 msgstr ""
 
 #: nova/virt/hyperv/livemigrationutils.py:40
@@ -7748,7 +7790,7 @@ msgid ""
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2293
+#: nova/virt/libvirt/driver.py:2302
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -7756,80 +7798,80 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2308
+#: nova/virt/libvirt/driver.py:2317
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2325
+#: nova/virt/libvirt/driver.py:2334
 #, 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:2493
+#: nova/virt/libvirt/driver.py:2502
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2546
+#: nova/virt/libvirt/driver.py:2555
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2548
+#: nova/virt/libvirt/driver.py:2557
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2612
+#: nova/virt/libvirt/driver.py:2621
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2695
+#: nova/virt/libvirt/driver.py:2704
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2719
+#: nova/virt/libvirt/driver.py:2728
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2723
+#: nova/virt/libvirt/driver.py:2732
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2857
+#: nova/virt/libvirt/driver.py:2866
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2865
+#: nova/virt/libvirt/driver.py:2874
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2902
+#: nova/virt/libvirt/driver.py:2911
 #, 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:2927
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2939
+#: nova/virt/libvirt/driver.py:2948
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -7839,62 +7881,62 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2956
+#: nova/virt/libvirt/driver.py:2965
 #, 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:3004
+#: nova/virt/libvirt/driver.py:3013
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3076
+#: nova/virt/libvirt/driver.py:3085
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3169
+#: nova/virt/libvirt/driver.py:3178
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3279
+#: nova/virt/libvirt/driver.py:3288
 #, 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:3296
+#: nova/virt/libvirt/driver.py:3305
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3334
+#: nova/virt/libvirt/driver.py:3343
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3380
+#: nova/virt/libvirt/driver.py:3389
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3439
+#: nova/virt/libvirt/driver.py:3448
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3445
+#: nova/virt/libvirt/driver.py:3454
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3501
+#: nova/virt/libvirt/driver.py:3515
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3614
+#: nova/virt/libvirt/driver.py:3636
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -8114,36 +8156,36 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:263 nova/virt/libvirt/vif.py:382
-#: nova/virt/libvirt/vif.py:469
+#: nova/virt/libvirt/vif.py:264 nova/virt/libvirt/vif.py:383
+#: nova/virt/libvirt/vif.py:470
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:269 nova/virt/libvirt/vif.py:388
-#: nova/virt/libvirt/vif.py:475
+#: nova/virt/libvirt/vif.py:270 nova/virt/libvirt/vif.py:389
+#: nova/virt/libvirt/vif.py:476
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:290 nova/virt/libvirt/vif.py:401
-#: nova/virt/libvirt/vif.py:488
+#: nova/virt/libvirt/vif.py:291 nova/virt/libvirt/vif.py:402
+#: nova/virt/libvirt/vif.py:489
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:302
+#: nova/virt/libvirt/vif.py:303
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:312
+#: nova/virt/libvirt/vif.py:313
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:418 nova/virt/libvirt/vif.py:447
+#: nova/virt/libvirt/vif.py:419 nova/virt/libvirt/vif.py:448
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -8943,7 +8985,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1050 nova/virt/xenapi/vmops.py:1263
+#: nova/virt/vmwareapi/vmops.py:1050 nova/virt/xenapi/vmops.py:1273
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -9101,19 +9143,19 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/agent.py:88 nova/virt/xenapi/vmops.py:1516
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1510
+#: nova/virt/xenapi/agent.py:92 nova/virt/xenapi/vmops.py:1520
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1515
+#: nova/virt/xenapi/agent.py:97 nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -9795,7 +9837,7 @@ msgstr ""
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:133 nova/virt/xenapi/vmops.py:740
+#: nova/virt/xenapi/vmops.py:133 nova/virt/xenapi/vmops.py:750
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -9809,187 +9851,187 @@ msgstr ""
 msgid "Error: Agent is disabled"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:267
+#: nova/virt/xenapi/vmops.py:277
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:336
+#: nova/virt/xenapi/vmops.py:346
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:409
+#: nova/virt/xenapi/vmops.py:419
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:440
+#: nova/virt/xenapi/vmops.py:450
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:519
+#: nova/virt/xenapi/vmops.py:529
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:536
+#: nova/virt/xenapi/vmops.py:546
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
+#: nova/virt/xenapi/vmops.py:592
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:598
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:602
+#: nova/virt/xenapi/vmops.py:612
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:615
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:616
+#: nova/virt/xenapi/vmops.py:626
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:653
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:651
+#: nova/virt/xenapi/vmops.py:661
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:709
+#: nova/virt/xenapi/vmops.py:719
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:713
+#: nova/virt/xenapi/vmops.py:723
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:721
+#: nova/virt/xenapi/vmops.py:731
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:758
+#: nova/virt/xenapi/vmops.py:768
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:764 nova/virt/xenapi/vmops.py:814
+#: nova/virt/xenapi/vmops.py:774 nova/virt/xenapi/vmops.py:824
 msgid "Clean shutdown did not complete successfully, trying hard shutdown."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:843
+#: nova/virt/xenapi/vmops.py:853
 msgid "Resize down not allowed without auto_disk_config"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:888
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:893
+#: nova/virt/xenapi/vmops.py:903
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:937
+#: nova/virt/xenapi/vmops.py:947
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1028
+#: nova/virt/xenapi/vmops.py:1038
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1032
+#: nova/virt/xenapi/vmops.py:1042
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1059
+#: nova/virt/xenapi/vmops.py:1069
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1066
+#: nova/virt/xenapi/vmops.py:1076
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1073
+#: nova/virt/xenapi/vmops.py:1083
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1100
+#: nova/virt/xenapi/vmops.py:1110
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1129
+#: nova/virt/xenapi/vmops.py:1139
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1180
+#: nova/virt/xenapi/vmops.py:1190
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1214
+#: nova/virt/xenapi/vmops.py:1224
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1267
+#: nova/virt/xenapi/vmops.py:1277
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1327
+#: nova/virt/xenapi/vmops.py:1337
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1410
+#: nova/virt/xenapi/vmops.py:1420
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1429
+#: nova/virt/xenapi/vmops.py:1439
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1438
+#: nova/virt/xenapi/vmops.py:1448
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1441
+#: nova/virt/xenapi/vmops.py:1451
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1469
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1565
+#: nova/virt/xenapi/vmops.py:1575
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1597
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1656
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1682
+#: nova/virt/xenapi/vmops.py:1692
 msgid "Migrate Send failed"
 msgstr ""
 
-- 
cgit