diff --git a/cinder/locale/cinder-log-error.pot b/cinder/locale/cinder-log-error.pot
index 8884cfa7c88..957fcadf4f1 100644
--- a/cinder/locale/cinder-log-error.pot
+++ b/cinder/locale/cinder-log-error.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cinder 2014.2.dev13.g04abab8\n"
+"Project-Id-Version: cinder 2014.2.dev127.gd5d2744\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
+"POT-Creation-Date: 2014-09-24 06: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"
@@ -27,6 +27,14 @@ msgstr ""
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr ""
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr ""
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -47,3 +55,11 @@ msgstr ""
 msgid "Failed to understand rule %r"
 msgstr ""
 
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr ""
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr ""
+
diff --git a/cinder/locale/cinder-log-info.pot b/cinder/locale/cinder-log-info.pot
index 92800077492..fd7c9e112d9 100644
--- a/cinder/locale/cinder-log-info.pot
+++ b/cinder/locale/cinder-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cinder 2014.2.dev97.g057d9fe\n"
+"Project-Id-Version: cinder 2014.2.dev127.gd5d2744\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
+"POT-Creation-Date: 2014-09-24 06: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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr ""
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -27,3 +32,55 @@ msgstr ""
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr ""
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr ""
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
diff --git a/cinder/locale/cinder-log-warning.pot b/cinder/locale/cinder-log-warning.pot
index afbf037746e..f04374d90de 100644
--- a/cinder/locale/cinder-log-warning.pot
+++ b/cinder/locale/cinder-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cinder 2014.2.dev97.g057d9fe\n"
+"Project-Id-Version: cinder 2014.2.dev127.gd5d2744\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:08+0000\n"
+"POT-Creation-Date: 2014-09-24 06: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"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
+#: cinder/openstack/common/loopingcall.py:87
+#, python-format
+msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
+msgstr ""
+
 #: cinder/openstack/common/network_utils.py:146
 msgid "tcp_keepidle not available on your system"
 msgstr ""
@@ -29,3 +34,8 @@ msgstr ""
 msgid "tcp_keepknt not available on your system"
 msgstr ""
 
+#: cinder/openstack/common/service.py:364
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
diff --git a/cinder/locale/cinder.pot b/cinder/locale/cinder.pot
index 1f3a69949be..8d13eba26c8 100644
--- a/cinder/locale/cinder.pot
+++ b/cinder/locale/cinder.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cinder 2014.2.dev13.g04abab8\n"
+"Project-Id-Version: cinder 2014.2.dev127.gd5d2744\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:08+0000\n"
+"POT-Creation-Date: 2014-09-24 06: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"
@@ -238,581 +238,583 @@ msgstr ""
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:298 cinder/brick/exception.py:108
-#, python-format
-msgid "Failed to create iscsi target for volume %(volume_id)s."
-msgstr ""
-
-#: cinder/exception.py:302 cinder/brick/exception.py:112
-#, python-format
-msgid "Failed to remove iscsi target for volume %(volume_id)s."
-msgstr ""
-
-#: cinder/exception.py:306 cinder/brick/exception.py:116
-#, python-format
-msgid "Failed to attach iSCSI target for volume %(volume_id)s."
-msgstr ""
-
-#: cinder/exception.py:310
+#: cinder/exception.py:298
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:314
+#: cinder/exception.py:302
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:318
+#: cinder/exception.py:306
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:322
+#: cinder/exception.py:310
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:326
+#: cinder/exception.py:314
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:330
+#: cinder/exception.py:318
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:334
+#: cinder/exception.py:322
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:338
+#: cinder/exception.py:326
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:342
+#: cinder/exception.py:330
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:347
+#: cinder/exception.py:335
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:351
+#: cinder/exception.py:339
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:355
+#: cinder/exception.py:343
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:359
+#: cinder/exception.py:347
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:363
+#: cinder/exception.py:351
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:367
+#: cinder/exception.py:355
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:371
+#: cinder/exception.py:359
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:375
+#: cinder/exception.py:363
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:384
+#: cinder/exception.py:372
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:388
+#: cinder/exception.py:376
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:392
+#: cinder/exception.py:380
 #, python-format
 msgid "Volume type encryption for type %(type_id)s does not exist."
 msgstr ""
 
-#: cinder/exception.py:396
+#: cinder/exception.py:384
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:400
+#: cinder/exception.py:388
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:404
+#: cinder/exception.py:392
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:408
+#: cinder/exception.py:396
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:412
+#: cinder/exception.py:400
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:421
+#: cinder/exception.py:409
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:428
+#: cinder/exception.py:416
 #, python-format
 msgid ""
 "Requested volume or snapshot exceeds allowed Gigabytes quota. Requested "
 "%(requested)sG, quota is %(quota)sG and %(consumed)sG has been consumed."
 msgstr ""
 
-#: cinder/exception.py:434
+#: cinder/exception.py:422
 #, python-format
 msgid ""
 "Requested backup exceeds allowed Backup Gigabytes quota. Requested "
 "%(requested)sG, quota is %(quota)sG and %(consumed)sG has been consumed."
 msgstr ""
 
-#: cinder/exception.py:440
+#: cinder/exception.py:428
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:444
+#: cinder/exception.py:432
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:448
+#: cinder/exception.py:436
 #, python-format
 msgid "Maximum number of backups allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:452
+#: cinder/exception.py:440
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:456
+#: cinder/exception.py:444
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:461
+#: cinder/exception.py:449
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:465
+#: cinder/exception.py:453
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:469
+#: cinder/exception.py:457
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:473
+#: cinder/exception.py:461
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:478
+#: cinder/exception.py:466
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:482
+#: cinder/exception.py:470
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:486
+#: cinder/exception.py:474
 #, python-format
 msgid "Failed to remove export for volume %(volume)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:490
+#: cinder/exception.py:478
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:494
+#: cinder/exception.py:482
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:498
+#: cinder/exception.py:486
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:502
+#: cinder/exception.py:490
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:506
+#: cinder/exception.py:494
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:510
+#: cinder/exception.py:498
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:514
+#: cinder/exception.py:502
 msgid "Unsupported backup metadata version requested"
 msgstr ""
 
-#: cinder/exception.py:518
+#: cinder/exception.py:506
+msgid "Unsupported backup verify driver"
+msgstr ""
+
+#: cinder/exception.py:510
 msgid "Metadata backup already exists for this volume"
 msgstr ""
 
-#: cinder/exception.py:522
+#: cinder/exception.py:514
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:526
+#: cinder/exception.py:518
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:530
+#: cinder/exception.py:522
 msgid "Failed to identify volume backend."
 msgstr ""
 
-#: cinder/exception.py:534
+#: cinder/exception.py:526
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:538
+#: cinder/exception.py:530
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:542
+#: cinder/exception.py:534
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:546
+#: cinder/exception.py:538
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:550
+#: cinder/exception.py:542
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:554
+#: cinder/exception.py:546
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:550
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:563
+#: cinder/exception.py:555
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:568
+#: cinder/exception.py:560
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:572
+#: cinder/exception.py:564
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:577
+#: cinder/exception.py:569
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:574
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:587
+#: cinder/exception.py:579
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:591
+#: cinder/exception.py:583
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
 
-#: cinder/exception.py:595
+#: cinder/exception.py:587
 #, python-format
 msgid "key manager error: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:599
+#: cinder/exception.py:591
 #, python-format
 msgid ""
 "Manage existing volume failed due to invalid backend reference "
 "%(existing_ref)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:604
+#: cinder/exception.py:596
 #, python-format
 msgid "Volume %(volume_id)s replication error: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:609
+#: cinder/exception.py:601
 #, python-format
 msgid "Volume replication for %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:606
 #, python-format
 msgid "Manage existing volume failed due to volume type mismatch: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:619
+#: cinder/exception.py:611
 #, python-format
 msgid "Error extending volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:625
+#: cinder/exception.py:617
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:629
+#: cinder/exception.py:621
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:633
+#: cinder/exception.py:625
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:637
+#: cinder/exception.py:629
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:641
+#: cinder/exception.py:633
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:645
+#: cinder/exception.py:637
 #, python-format
 msgid "ESM configure request failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:649
+#: cinder/exception.py:641
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:646
 #, python-format
 msgid "Pure Storage Cinder driver failure: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:658
+#: cinder/exception.py:650
 #, python-format
 msgid "Bad response from Pure Storage REST API: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:663
+#: cinder/exception.py:655
 msgid "Zadara Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:667
+#: cinder/exception.py:659
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:671
+#: cinder/exception.py:663
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:675
+#: cinder/exception.py:667
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:679
+#: cinder/exception.py:671
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:675
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:679
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:692
+#: cinder/exception.py:684
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:696
+#: cinder/exception.py:688
 msgid "SolidFire Cinder Driver exception"
 msgstr ""
 
-#: cinder/exception.py:700
+#: cinder/exception.py:692
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:704
+#: cinder/exception.py:696
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:710
+#: cinder/exception.py:702
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:715
+#: cinder/exception.py:707
 msgid "Unknown RemoteFS exception"
 msgstr ""
 
-#: cinder/exception.py:719
+#: cinder/exception.py:711
 msgid "No mounted shares found"
 msgstr ""
 
-#: cinder/exception.py:723 cinder/exception.py:736 cinder/exception.py:749
+#: cinder/exception.py:715 cinder/exception.py:728 cinder/exception.py:754
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:728
+#: cinder/exception.py:720
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:732
+#: cinder/exception.py:724
 msgid "No mounted NFS shares found"
 msgstr ""
 
+#: cinder/exception.py:733
+msgid "Unknown SMBFS exception."
+msgstr ""
+
+#: cinder/exception.py:737
+msgid "No mounted SMBFS shares found."
+msgstr ""
+
 #: cinder/exception.py:741
+#, python-format
+msgid "There is no share which can host %(volume_size)sG."
+msgstr ""
+
+#: cinder/exception.py:746
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:745
+#: cinder/exception.py:750
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:754
+#: cinder/exception.py:759
 msgid "HP MSA Volume Driver exception"
 msgstr ""
 
-#: cinder/exception.py:758
+#: cinder/exception.py:763
 #, python-format
 msgid "VDisk doesn't exist (%(vdisk)s)"
 msgstr ""
 
-#: cinder/exception.py:762
+#: cinder/exception.py:767
 msgid "Unable to connect to MSA array"
 msgstr ""
 
-#: cinder/exception.py:766
-#, python-format
-msgid "Not enough space on VDisk (%(vdisk)s)"
-msgstr ""
-
 #: cinder/exception.py:771
 #, python-format
+msgid "Not enough space on VDisk (%(vdisk)s)"
+msgstr ""
+
+#: cinder/exception.py:776
+#, python-format
 msgid "Fibre Channel connection control failure: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:775
+#: cinder/exception.py:780
 #, python-format
 msgid "Fibre Channel Zone operation failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:779
+#: cinder/exception.py:784
 #, python-format
 msgid "Fibre Channel SAN Lookup failure: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:783 cinder/exception.py:787
+#: cinder/exception.py:788 cinder/exception.py:792
 #, python-format
 msgid "Fibre Channel Zoning CLI error: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:791
+#: cinder/exception.py:796
 msgid "NetApp Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:800
+#: cinder/exception.py:805
 #, python-format
 msgid "EMCVnxCLICmdError : %(cmd)s (Return Code: %(rc)s) (Output: %(out)s) "
 msgstr ""
 
-#: cinder/exception.py:816
+#: cinder/exception.py:821
 #, python-format
 msgid "ConsistencyGroup %(consistencygroup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:820
+#: cinder/exception.py:825
 #, python-format
 msgid "Invalid ConsistencyGroup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:825
+#: cinder/exception.py:830
 #, python-format
 msgid "CgSnapshot %(cgsnapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:829
+#: cinder/exception.py:834
 #, python-format
 msgid "Invalid CgSnapshot: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:834
+#: cinder/exception.py:839
 msgid "HBSD error occurs."
 msgstr ""
 
-#: cinder/exception.py:851
+#: cinder/exception.py:856
 msgid "Storage resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:856
+#: cinder/exception.py:861
 msgid "Bad response from Datera API"
 msgstr ""
 
@@ -947,86 +949,86 @@ msgstr ""
 msgid "Can not translate %s to integer."
 msgstr ""
 
-#: cinder/utils.py:126
+#: cinder/utils.py:134
 #, python-format
 msgid "May specify only one of %s"
 msgstr ""
 
-#: cinder/utils.py:283
+#: cinder/utils.py:291
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: cinder/utils.py:610
+#: cinder/utils.py:618
 #, python-format
 msgid "Volume driver %s not initialized"
 msgstr ""
 
-#: cinder/utils.py:667
+#: cinder/utils.py:675
 #, python-format
 msgid "Unable to get a block device for file '%s'"
 msgstr ""
 
-#: cinder/utils.py:679
+#: cinder/utils.py:687
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: cinder/utils.py:683
+#: cinder/utils.py:691
 #, python-format
 msgid "%(name)s has a minimum character requirement of %(min_length)s."
 msgstr ""
 
-#: cinder/utils.py:688
+#: cinder/utils.py:696
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: cinder/wsgi.py:145 cinder/openstack/common/sslutils.py:50
+#: cinder/wsgi.py:146 cinder/openstack/common/sslutils.py:50
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: cinder/wsgi.py:149 cinder/openstack/common/sslutils.py:53
+#: cinder/wsgi.py:150 cinder/openstack/common/sslutils.py:53
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: cinder/wsgi.py:152 cinder/openstack/common/sslutils.py:56
+#: cinder/wsgi.py:153 cinder/openstack/common/sslutils.py:56
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: cinder/wsgi.py:156
+#: cinder/wsgi.py:157
 msgid ""
 "When running server in SSL mode, you must specify both a cert_file and "
 "key_file option value in your configuration file."
 msgstr ""
 
-#: cinder/wsgi.py:172
+#: cinder/wsgi.py:173
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds"
 msgstr ""
 
-#: cinder/wsgi.py:177
+#: cinder/wsgi.py:178
 #, python-format
 msgid "%(name)s listening on %(_host)s:%(_port)s"
 msgstr ""
 
-#: cinder/wsgi.py:218
+#: cinder/wsgi.py:223
 #, python-format
 msgid "Failed to start %(name)s on %(_host)s:%(_port)s with SSL support."
 msgstr ""
 
-#: cinder/wsgi.py:249
+#: cinder/wsgi.py:254
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: cinder/wsgi.py:267
+#: cinder/wsgi.py:272
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: cinder/wsgi.py:344
+#: cinder/wsgi.py:349
 msgid "You must implement __call__"
 msgstr ""
 
@@ -1050,12 +1052,12 @@ msgid ""
 msgstr ""
 
 #: cinder/api/common.py:94 cinder/api/common.py:128
-#: cinder/consistencygroup/api.py:305 cinder/volume/api.py:329
+#: cinder/consistencygroup/api.py:312 cinder/volume/api.py:373
 msgid "limit param must be an integer"
 msgstr ""
 
 #: cinder/api/common.py:97 cinder/api/common.py:132
-#: cinder/consistencygroup/api.py:302 cinder/volume/api.py:326
+#: cinder/consistencygroup/api.py:309 cinder/volume/api.py:370
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1136,44 +1138,44 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:65
+#: cinder/api/contrib/admin_actions.py:67
 msgid "Must specify 'status'"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:68
+#: cinder/api/contrib/admin_actions.py:70
 msgid "Must specify a valid status"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:82
+#: cinder/api/contrib/admin_actions.py:84
 #, python-format
 msgid "Updating %(resource)s '%(id)s' with '%(update)r'"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:158
+#: cinder/api/contrib/admin_actions.py:160
 msgid "Must specify a valid attach status"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:165
+#: cinder/api/contrib/admin_actions.py:167
 msgid "Must specify a valid migration status"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:171
+#: cinder/api/contrib/admin_actions.py:173
 msgid "Must specify 'status', 'attach_status' or 'migration_status' for update."
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:202
+#: cinder/api/contrib/admin_actions.py:204
 msgid "Must specify 'host'"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:210
+#: cinder/api/contrib/admin_actions.py:212
 msgid "Bad value for 'force_host_copy'"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:213
+#: cinder/api/contrib/admin_actions.py:215
 msgid "'force_host_copy' not string or bool"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:231
+#: cinder/api/contrib/admin_actions.py:233
 msgid "Must specify 'new_volume'"
 msgstr ""
 
@@ -1184,9 +1186,9 @@ msgstr ""
 
 #: cinder/api/contrib/backups.py:244 cinder/api/contrib/backups.py:276
 #: cinder/api/contrib/cgsnapshots.py:168
-#: cinder/api/contrib/consistencygroups.py:174
-#: cinder/api/contrib/volume_transfer.py:157
-#: cinder/api/contrib/volume_transfer.py:193
+#: cinder/api/contrib/consistencygroups.py:173
+#: cinder/api/contrib/volume_transfer.py:158
+#: cinder/api/contrib/volume_transfer.py:194
 msgid "Incorrect request body format"
 msgstr ""
 
@@ -1226,7 +1228,6 @@ msgid "'consistencygroup_id' must be specified"
 msgstr ""
 
 #: cinder/api/contrib/cgsnapshots.py:180
-#: cinder/api/contrib/consistencygroups.py:128
 msgid "Consistency group could not be found"
 msgstr ""
 
@@ -1240,11 +1241,17 @@ msgstr ""
 msgid "Delete consistency group with id: %s"
 msgstr ""
 
-#: cinder/api/contrib/consistencygroups.py:131
-msgid "Invalid consistency group"
+#: cinder/api/contrib/consistencygroups.py:128
+#, python-format
+msgid "Consistency group %s could not be found."
 msgstr ""
 
-#: cinder/api/contrib/consistencygroups.py:181
+#: cinder/api/contrib/consistencygroups.py:179
+#, python-format
+msgid "volume_types must be provided to create consistency group %(name)s."
+msgstr ""
+
+#: cinder/api/contrib/consistencygroups.py:184
 #, python-format
 msgid "Creating consistency group %(name)s."
 msgstr ""
@@ -1519,17 +1526,17 @@ msgstr ""
 msgid "Attempting to sync secondary replica with primary for volume %s."
 msgstr ""
 
-#: cinder/api/contrib/volume_transfer.py:162
+#: cinder/api/contrib/volume_transfer.py:163
 #, python-format
 msgid "Creating transfer of volume %s"
 msgstr ""
 
-#: cinder/api/contrib/volume_transfer.py:196
+#: cinder/api/contrib/volume_transfer.py:197
 #, python-format
 msgid "Accepting transfer %s"
 msgstr ""
 
-#: cinder/api/contrib/volume_transfer.py:217
+#: cinder/api/contrib/volume_transfer.py:218
 #, python-format
 msgid "Delete transfer with id: %s"
 msgstr ""
@@ -1869,7 +1876,7 @@ msgstr ""
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr ""
 
-#: cinder/backup/api.py:275
+#: cinder/backup/api.py:290
 #, python-format
 msgid "Backup status must be available and not %s."
 msgstr ""
@@ -1890,110 +1897,110 @@ msgstr ""
 msgid "Unsupported backup metadata version (%s)"
 msgstr ""
 
-#: cinder/backup/manager.py:107
+#: cinder/backup/manager.py:108
 msgid "NULL host not allowed for volume backend lookup."
 msgstr ""
 
-#: cinder/backup/manager.py:117
+#: cinder/backup/manager.py:118
 #, python-format
 msgid "Backend not found in hostname (%s) so using default."
 msgstr ""
 
-#: cinder/backup/manager.py:133
+#: cinder/backup/manager.py:134
 #, python-format
 msgid "Volume manager for backend '%s' does not exist."
 msgstr ""
 
-#: cinder/backup/manager.py:168
+#: cinder/backup/manager.py:169
 #, python-format
 msgid "Starting volume driver %(driver_name)s (%(version)s)."
 msgstr ""
 
-#: cinder/backup/manager.py:175
+#: cinder/backup/manager.py:176
 #, python-format
 msgid "Error encountered during initialization of driver: %(name)s."
 msgstr ""
 
-#: cinder/backup/manager.py:194
+#: cinder/backup/manager.py:195
 msgid "Cleaning up incomplete backup operations."
 msgstr ""
 
-#: cinder/backup/manager.py:200
+#: cinder/backup/manager.py:201
 #, python-format
 msgid "Resetting volume %s to available (was backing-up)."
 msgstr ""
 
-#: cinder/backup/manager.py:205
+#: cinder/backup/manager.py:206
 #, python-format
 msgid "Resetting volume %s to error_restoring (was restoring-backup)."
 msgstr ""
 
-#: cinder/backup/manager.py:217
+#: cinder/backup/manager.py:218
 #, python-format
 msgid "Resetting backup %s to error (was creating)."
 msgstr ""
 
-#: cinder/backup/manager.py:223
+#: cinder/backup/manager.py:224
 #, python-format
 msgid "Resetting backup %s to available (was restoring)."
 msgstr ""
 
-#: cinder/backup/manager.py:228
+#: cinder/backup/manager.py:229
 #, python-format
 msgid "Resuming delete on backup: %s."
 msgstr ""
 
-#: cinder/backup/manager.py:236
+#: cinder/backup/manager.py:237
 #, python-format
 msgid "Create backup started, backup: %(backup_id)s volume: %(volume_id)s."
 msgstr ""
 
-#: cinder/backup/manager.py:249
+#: cinder/backup/manager.py:250
 #, python-format
 msgid ""
 "Create backup aborted, expected volume status %(expected_status)s but got"
 " %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:261
+#: cinder/backup/manager.py:262
 #, python-format
 msgid ""
 "Create backup aborted, expected backup status %(expected_status)s but got"
 " %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:294
+#: cinder/backup/manager.py:295
 #, python-format
 msgid "Create backup finished. backup: %s."
 msgstr ""
 
-#: cinder/backup/manager.py:298
+#: cinder/backup/manager.py:299
 #, python-format
 msgid "Restore backup started, backup: %(backup_id)s volume: %(volume_id)s."
 msgstr ""
 
-#: cinder/backup/manager.py:312
+#: cinder/backup/manager.py:313
 #, python-format
 msgid ""
 "Restore backup aborted, expected volume status %(expected_status)s but "
 "got %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:322
+#: cinder/backup/manager.py:323
 #, python-format
 msgid ""
 "Restore backup aborted: expected backup status %(expected_status)s but "
 "got %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:332
+#: cinder/backup/manager.py:333
 #, python-format
 msgid ""
 "Volume: %(vol_id)s, size: %(vol_size)d is larger than backup: "
 "%(backup_id)s, size: %(backup_size)d, continuing with restore."
 msgstr ""
 
-#: cinder/backup/manager.py:343
+#: cinder/backup/manager.py:344
 #, python-format
 msgid ""
 "Restore backup aborted, the backup service currently configured "
@@ -2001,26 +2008,26 @@ msgid ""
 "create this backup [%(backup_service)s]."
 msgstr ""
 
-#: cinder/backup/manager.py:374
+#: cinder/backup/manager.py:375
 #, python-format
 msgid ""
 "Restore backup finished, backup %(backup_id)s restored to volume "
 "%(volume_id)s."
 msgstr ""
 
-#: cinder/backup/manager.py:393
+#: cinder/backup/manager.py:394
 #, python-format
 msgid "Delete backup started, backup: %s."
 msgstr ""
 
-#: cinder/backup/manager.py:400
+#: cinder/backup/manager.py:401
 #, python-format
 msgid ""
 "Delete_backup aborted, expected backup status %(expected_status)s but got"
 " %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:412
+#: cinder/backup/manager.py:413
 #, python-format
 msgid ""
 "Delete backup aborted, the backup service currently configured "
@@ -2028,28 +2035,28 @@ msgid ""
 "create this backup [%(backup_service)s]."
 msgstr ""
 
-#: cinder/backup/manager.py:443
+#: cinder/backup/manager.py:444
 msgid "Failed to update usages deleting backup"
 msgstr ""
 
-#: cinder/backup/manager.py:453
+#: cinder/backup/manager.py:454
 #, python-format
 msgid "Delete backup finished, backup %s deleted."
 msgstr ""
 
-#: cinder/backup/manager.py:468
+#: cinder/backup/manager.py:469
 #, python-format
 msgid "Export record started, backup: %s."
 msgstr ""
 
-#: cinder/backup/manager.py:475
+#: cinder/backup/manager.py:476
 #, python-format
 msgid ""
 "Export backup aborted, expected backup status %(expected_status)s but got"
 " %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:486
+#: cinder/backup/manager.py:487
 #, python-format
 msgid ""
 "Export record aborted, the backup service currently configured "
@@ -2057,40 +2064,81 @@ msgid ""
 "create this backup [%(backup_service)s]."
 msgstr ""
 
-#: cinder/backup/manager.py:504
+#: cinder/backup/manager.py:505
 #, python-format
 msgid "Export record finished, backup %s exported."
 msgstr ""
 
-#: cinder/backup/manager.py:523
+#: cinder/backup/manager.py:524
 #, python-format
 msgid "Import record started, backup_url: %s."
 msgstr ""
 
-#: cinder/backup/manager.py:539
+#: cinder/backup/manager.py:540
 #, python-format
 msgid ""
 "Import record failed, cannot find backup service to perform the import. "
 "Request service %(service)s"
 msgstr ""
 
-#: cinder/backup/manager.py:574
+#: cinder/backup/manager.py:575
 #, python-format
 msgid "Backup metadata received from driver for import is missing %s."
 msgstr ""
 
-#: cinder/backup/manager.py:590
+#: cinder/backup/manager.py:591
 #, python-format
 msgid ""
 "Backup service %(service)s does not support verify. Backup id %(id)s is "
 "not verified. Skipping verify."
 msgstr ""
 
-#: cinder/backup/manager.py:602
+#: cinder/backup/manager.py:603
 #, python-format
 msgid "Import record id %s metadata from driver finished."
 msgstr ""
 
+#: cinder/backup/manager.py:616
+#, python-format
+msgid "Reset backup status started, backup_id: %(backup_id)s, status: %(status)s."
+msgstr ""
+
+#: cinder/backup/manager.py:628
+msgid "Backup driver has not been initialized"
+msgstr ""
+
+#: cinder/backup/manager.py:632
+#, python-format
+msgid "Backup service: %s."
+msgstr ""
+
+#: cinder/backup/manager.py:636
+#, python-format
+msgid ""
+"Reset backup status aborted, the backup service currently configured "
+"[%(configured_service)s] is not the backup service that was used to "
+"create this backup [%(backup_service)s]."
+msgstr ""
+
+#: cinder/backup/manager.py:655 cinder/backup/manager.py:677
+#, python-format
+msgid ""
+"Backup service %(configured_service)s does not support verify. Backup id "
+"%(id)s is not verified. Skipping verify."
+msgstr ""
+
+#: cinder/backup/manager.py:672
+#, python-format
+msgid "Backup id %(id)s is not invalid. Skipping reset."
+msgstr ""
+
+#: cinder/backup/manager.py:685
+#, python-format
+msgid ""
+"Backup service %(service)s does not support verify. Backup id %(id)s is "
+"not verified. Skipping reset."
+msgstr ""
+
 #: cinder/backup/drivers/ceph.py:129 cinder/tests/test_backup_ceph.py:968
 #, python-format
 msgid "Metadata backup object '%s' already exists"
@@ -2436,6 +2484,21 @@ msgstr ""
 msgid "Failed to create Volume Group: %(vg_name)s"
 msgstr ""
 
+#: cinder/brick/exception.py:108
+#, python-format
+msgid "Failed to create iscsi target for volume %(volume_id)s."
+msgstr ""
+
+#: cinder/brick/exception.py:112
+#, python-format
+msgid "Failed to remove iscsi target for volume %(volume_id)s."
+msgstr ""
+
+#: cinder/brick/exception.py:116
+#, python-format
+msgid "Failed to attach iSCSI target for volume %(volume_id)s."
+msgstr ""
+
 #: cinder/brick/exception.py:120
 #, python-format
 msgid "Connect to volume via protocol %(protocol)s not supported."
@@ -2512,57 +2575,54 @@ msgstr ""
 msgid "Couldn't find multipath device %(line)s"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:139 cinder/volume/targets/tgt.py:87
+#: cinder/brick/iscsi/iscsi.py:139
 msgid "Attempting recreate of backing lun..."
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:157 cinder/volume/targets/tgt.py:104
+#: cinder/brick/iscsi/iscsi.py:157
 #, python-format
 msgid ""
 "Failed to recover attempt to create iscsi backing lun for volume "
 "id:%(vol_id)s: %(e)s"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:178 cinder/volume/targets/tgt.py:169
+#: cinder/brick/iscsi/iscsi.py:178
 #, python-format
 msgid "Creating iscsi_target for: %s"
 msgstr ""
 
 #: cinder/brick/iscsi/iscsi.py:217 cinder/brick/iscsi/iscsi.py:375
-#: cinder/volume/targets/tgt.py:208
 #, python-format
 msgid "Failed to create iscsi target for volume id:%(vol_id)s: %(e)s"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:228 cinder/volume/targets/tgt.py:219
+#: cinder/brick/iscsi/iscsi.py:228
 #, python-format
 msgid ""
 "Failed to create iscsi target for volume id:%(vol_id)s. Please ensure "
 "your tgtd config file contains 'include %(volumes_dir)s/*'"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:258 cinder/volume/targets/tgt.py:304
+#: cinder/brick/iscsi/iscsi.py:258
 #, python-format
 msgid "Removing iscsi_target for: %s"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:262 cinder/volume/targets/tgt.py:308
+#: cinder/brick/iscsi/iscsi.py:262
 #, python-format
 msgid "Volume path %s does not exist, nothing to remove."
 msgstr ""
 
 #: cinder/brick/iscsi/iscsi.py:280 cinder/brick/iscsi/iscsi.py:304
-#: cinder/volume/targets/tgt.py:326 cinder/volume/targets/tgt.py:349
 #, python-format
 msgid "Failed to remove iscsi target for volume id:%(vol_id)s: %(e)s"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:297 cinder/volume/targets/tgt.py:342
+#: cinder/brick/iscsi/iscsi.py:297
 msgid "Silent failure of target removal detected, retry...."
 msgstr ""
 
 #: cinder/brick/iscsi/iscsi.py:322 cinder/brick/iscsi/iscsi.py:554
-#: cinder/volume/targets/lio.py:148 cinder/volume/targets/tgt.py:367
 msgid "valid iqn needed for show_target"
 msgstr ""
 
@@ -2571,32 +2631,31 @@ msgstr ""
 msgid "Removing iscsi_target for volume: %s"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:476 cinder/volume/targets/lio.py:70
+#: cinder/brick/iscsi/iscsi.py:476
 msgid "cinder-rtstool is not installed correctly"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:496 cinder/volume/targets/lio.py:90
+#: cinder/brick/iscsi/iscsi.py:496
 #, python-format
 msgid "Creating iscsi_target for volume: %s"
 msgstr ""
 
 #: cinder/brick/iscsi/iscsi.py:520 cinder/brick/iscsi/iscsi.py:529
-#: cinder/volume/targets/lio.py:114 cinder/volume/targets/lio.py:123
 #, python-format
 msgid "Failed to create iscsi target for volume id:%s."
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:536 cinder/volume/targets/lio.py:130
+#: cinder/brick/iscsi/iscsi.py:536
 #, python-format
 msgid "Removing iscsi_target: %s"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:546 cinder/volume/targets/lio.py:140
+#: cinder/brick/iscsi/iscsi.py:546
 #, python-format
 msgid "Failed to remove iscsi target for volume id:%s."
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:575 cinder/volume/targets/lio.py:169
+#: cinder/brick/iscsi/iscsi.py:575
 #, python-format
 msgid "Failed to add initiator iqn %s to target"
 msgstr ""
@@ -2684,24 +2743,28 @@ msgid "nfs_mount_point_base required"
 msgstr ""
 
 #: cinder/brick/remotefs/remotefs.py:49
+msgid "smbfs_mount_point_base required"
+msgstr ""
+
+#: cinder/brick/remotefs/remotefs.py:55
 msgid "glusterfs_mount_point_base required"
 msgstr ""
 
-#: cinder/brick/remotefs/remotefs.py:90
+#: cinder/brick/remotefs/remotefs.py:96
 #, python-format
 msgid "Already mounted: %s"
 msgstr ""
 
-#: cinder/brick/remotefs/remotefs.py:130
+#: cinder/brick/remotefs/remotefs.py:136
 #, python-format
-msgid "NFS mount failed for share %(sh)s.Error - %(error)s"
-msgstr ""
-
-#: cinder/common/config.py:119
-msgid "DEPRECATED: Deploy v1 of the Cinder API."
+msgid "NFS mount failed for share %(sh)s. Error - %(error)s"
 msgstr ""
 
 #: cinder/common/config.py:122
+msgid "DEPRECATED: Deploy v1 of the Cinder API."
+msgstr ""
+
+#: cinder/common/config.py:125
 msgid "Deploy v2 of the Cinder API."
 msgstr ""
 
@@ -2719,59 +2782,59 @@ msgstr ""
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/consistencygroup/api.py:146
+#: cinder/consistencygroup/api.py:139
 #, python-format
 msgid "Error occurred when creating consistency group %s."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:209
+#: cinder/consistencygroup/api.py:202
 #, python-format
 msgid "Error occurred when building request spec list for consistency group %s."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:232
+#: cinder/consistencygroup/api.py:229
 #, python-format
-msgid "Failed to update quota for creatingconsistency group %s."
+msgid "Failed to update quota for consistency group %s."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:238
+#: cinder/consistencygroup/api.py:245
 #, python-format
 msgid ""
 "Consistency group status must be available or error, but current status "
 "is: %s"
 msgstr ""
 
-#: cinder/consistencygroup/api.py:246
+#: cinder/consistencygroup/api.py:253
 #, python-format
 msgid "Consistency group %s still has dependent cgsnapshots."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:255
+#: cinder/consistencygroup/api.py:262
 #, python-format
 msgid ""
 "Consistency group %s still contains volumes. The force flag is required "
 "to delete it."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:262
+#: cinder/consistencygroup/api.py:269
 #, python-format
 msgid "Volume in consistency group %s is attached. Need to detach first."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:270
+#: cinder/consistencygroup/api.py:277
 msgid "Volume in consistency group still has dependent snapshots."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:350
+#: cinder/consistencygroup/api.py:357
 msgid "Consistency group is empty. No cgsnapshot will be created."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:364 cinder/volume/manager.py:1808
+#: cinder/consistencygroup/api.py:371 cinder/volume/manager.py:1814
 #, python-format
 msgid "Error occurred when creating cgsnapshot %s."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:373
+#: cinder/consistencygroup/api.py:380
 msgid "Cgsnapshot status must be available or error"
 msgstr ""
 
@@ -2872,8 +2935,8 @@ msgstr ""
 #: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49
 #: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:81
 #: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:52
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:78
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:53
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:79
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3006,19 +3069,27 @@ msgid ""
 "exist."
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:89
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:90
 msgid "Adding consistencygroup_id column to volumes table failed."
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:102
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:103
 msgid "Adding cgsnapshot_id column to snapshots table failed."
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:126
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:127
+msgid "Dropping foreign key 'cgsnapshot_id' in the 'snapshots' table failed."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:149
+msgid "Dropping foreign key 'consistencygroup_id' in the 'volumes' table failed."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:161
 msgid "cgsnapshots table not dropped"
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:134
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:169
 msgid "consistencygroups table not dropped"
 msgstr ""
 
@@ -3036,61 +3107,61 @@ msgstr ""
 msgid "Default consistencygroups quota class data not inserted into the DB."
 msgstr ""
 
-#: cinder/image/glance.py:171 cinder/image/glance.py:179
+#: cinder/image/glance.py:172 cinder/image/glance.py:180
 #, python-format
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:89
+#: cinder/image/image_utils.py:93
 #, python-format
 msgid "Converted %(sz).2f MB image at %(mbps).2f MB/s"
 msgstr ""
 
-#: cinder/image/image_utils.py:121
+#: cinder/image/image_utils.py:125
 #, python-format
 msgid "Image download %(sz).2f MB at %(mbps).2f MB/s"
 msgstr ""
 
-#: cinder/image/image_utils.py:135 cinder/image/image_utils.py:240
+#: cinder/image/image_utils.py:139 cinder/image/image_utils.py:244
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:142
+#: cinder/image/image_utils.py:146
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:150 cinder/image/image_utils.py:233
+#: cinder/image/image_utils.py:154 cinder/image/image_utils.py:237
 #, python-format
 msgid ""
 "Size is %(image_size)dGB and doesn't fit in a volume of size "
 "%(volume_size)dGB."
 msgstr ""
 
-#: cinder/image/image_utils.py:198
+#: cinder/image/image_utils.py:202
 #, python-format
 msgid ""
 "qemu-img is not installed and image is of type %s.  Only RAW images can "
 "be used if qemu-img is not installed."
 msgstr ""
 
-#: cinder/image/image_utils.py:205
+#: cinder/image/image_utils.py:209
 msgid ""
 "qemu-img is not installed and the disk format is not specified.  Only RAW"
 " images can be used if qemu-img is not installed."
 msgstr ""
 
-#: cinder/image/image_utils.py:247
+#: cinder/image/image_utils.py:251
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:266
+#: cinder/image/image_utils.py:270
 #, python-format
 msgid "Converted to %(vol_format)s, but format is now %(file_format)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:303
+#: cinder/image/image_utils.py:307
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -3154,11 +3225,6 @@ msgstr ""
 msgid "Not deleting key %s"
 msgstr ""
 
-#: cinder/openstack/common/eventlet_backdoor.py:140
-#, python-format
-msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
-msgstr ""
-
 #: cinder/openstack/common/gettextutils.py:301
 msgid "Message objects do not support addition."
 msgstr ""
@@ -3203,45 +3269,26 @@ msgstr ""
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: cinder/openstack/common/log.py:289
+#: cinder/openstack/common/log.py:290
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:397
+#: cinder/openstack/common/log.py:398
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:458
+#: cinder/openstack/common/log.py:459
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: cinder/openstack/common/log.py:709
+#: cinder/openstack/common/log.py:710
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: cinder/openstack/common/loopingcall.py:82
-#, python-format
-msgid "task run outlasted interval by %s sec"
-msgstr ""
-
-#: cinder/openstack/common/loopingcall.py:89
-#: cinder/tests/brick/test_brick_connector.py:462
-msgid "in fixed duration looping call"
-msgstr ""
-
-#: cinder/openstack/common/loopingcall.py:129
-#, python-format
-msgid "Dynamic looping call sleeping for %.02f seconds"
-msgstr ""
-
-#: cinder/openstack/common/loopingcall.py:136
-msgid "in dynamic looping call"
-msgstr ""
-
 #: cinder/openstack/common/periodic_task.py:40
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
@@ -3323,68 +3370,6 @@ msgid ""
 "'%(source_id)s'%(arrow)s%(target_name)s%(target_id)s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:166
-#: cinder/openstack/common/service.py:384
-msgid "Full set of CONF:"
-msgstr ""
-
-#: cinder/openstack/common/service.py:175
-#: cinder/openstack/common/service.py:269
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: cinder/openstack/common/service.py:187
-msgid "Exception during rpc cleanup."
-msgstr ""
-
-#: cinder/openstack/common/service.py:238
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: cinder/openstack/common/service.py:275
-msgid "Unhandled exception"
-msgstr ""
-
-#: cinder/openstack/common/service.py:308
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: cinder/openstack/common/service.py:327
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: cinder/openstack/common/service.py:337
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: cinder/openstack/common/service.py:354
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: cinder/openstack/common/service.py:358
-#, python-format
-msgid "Child %(pid)s exited with status %(code)d"
-msgstr ""
-
-#: cinder/openstack/common/service.py:362
-#, python-format
-msgid "pid %d not in child list"
-msgstr ""
-
-#: cinder/openstack/common/service.py:392
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: cinder/openstack/common/service.py:410
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr ""
-
 #: cinder/openstack/common/sslutils.py:59
 msgid ""
 "When running server in SSL mode, you must specify both a cert_file and "
@@ -3491,6 +3476,10 @@ msgstr ""
 msgid "Must implement schedule_create_consistencygroup"
 msgstr ""
 
+#: cinder/scheduler/driver.py:104
+msgid "Must implement schedule_get_pools"
+msgstr ""
+
 #: cinder/scheduler/filter_scheduler.py:119
 #, python-format
 msgid "Cannot place volume %(id)s on %(host)s"
@@ -3508,23 +3497,23 @@ msgid ""
 "not allowed"
 msgstr ""
 
-#: cinder/scheduler/filter_scheduler.py:193
+#: cinder/scheduler/filter_scheduler.py:197
 msgid "Invalid value for 'scheduler_max_attempts', must be >=1"
 msgstr ""
 
-#: cinder/scheduler/filter_scheduler.py:211
+#: cinder/scheduler/filter_scheduler.py:215
 #, python-format
 msgid ""
 "Error scheduling %(volume_id)s from last vol-service: %(last_host)s : "
 "%(exc)s"
 msgstr ""
 
-#: cinder/scheduler/filter_scheduler.py:244
+#: cinder/scheduler/filter_scheduler.py:248
 #, python-format
 msgid "Exceeded max scheduling attempts %(max_attempts)d for volume %(volume_id)s"
 msgstr ""
 
-#: cinder/scheduler/filter_scheduler.py:396
+#: cinder/scheduler/filter_scheduler.py:400
 #, python-format
 msgid "No weighed hosts found for volume with properties: %s"
 msgstr ""
@@ -3547,12 +3536,12 @@ msgid ""
 "certain combination of filters and weighers."
 msgstr ""
 
-#: cinder/scheduler/manager.py:100
+#: cinder/scheduler/manager.py:100 cinder/tests/scheduler/test_scheduler.py:226
 #, python-format
 msgid "Could not find a host for consistency group %(group_id)s."
 msgstr ""
 
-#: cinder/scheduler/manager.py:108
+#: cinder/scheduler/manager.py:108 cinder/tests/scheduler/test_scheduler.py:212
 #, python-format
 msgid "Failed to create consistency group %(group_id)s."
 msgstr ""
@@ -3570,7 +3559,7 @@ msgstr ""
 msgid "Could not find a host for volume %(volume_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/scheduler/manager.py:247
+#: cinder/scheduler/manager.py:251
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -3589,11 +3578,11 @@ msgstr ""
 msgid "Free capacity not set: volume node info collection broken."
 msgstr ""
 
-#: cinder/scheduler/filters/capacity_filter.py:58
+#: cinder/scheduler/filters/capacity_filter.py:62
 #, python-format
 msgid ""
-"Insufficient free space for volume creation (requested / avail): "
-"%(requested)s/%(available)s"
+"Insufficient free space for volume creation on host %(host)s (requested /"
+" avail): %(requested)s/%(available)s"
 msgstr ""
 
 #: cinder/scheduler/flows/create_volume.py:53
@@ -3664,15 +3653,28 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: cinder/tests/test_netapp.py:1328
+#: cinder/tests/test_netapp.py:667 cinder/volume/drivers/netapp/iscsi.py:272
+#, python-format
+msgid "No iscsi target details were found for LUN %s"
+msgstr ""
+
+#: cinder/tests/test_netapp.py:673
+msgid "Expected exception message is missing"
+msgstr ""
+
+#: cinder/tests/test_netapp.py:675
+msgid "VolumeBackendAPIException not raised"
+msgstr ""
+
+#: cinder/tests/test_netapp.py:1333
 msgid "Error not a TypeError."
 msgstr ""
 
-#: cinder/tests/test_netapp.py:1337
+#: cinder/tests/test_netapp.py:1342
 msgid "Error not a KeyError."
 msgstr ""
 
-#: cinder/tests/test_netapp_nfs.py:364
+#: cinder/tests/test_netapp_nfs.py:366
 #, python-format
 msgid "Share %(share)s and file name %(file_name)s"
 msgstr ""
@@ -3686,12 +3688,12 @@ msgstr ""
 msgid "unrecognized argument %s"
 msgstr ""
 
-#: cinder/tests/test_volume_types.py:61
+#: cinder/tests/test_volume_types.py:63
 #, python-format
 msgid "Given data: %s"
 msgstr ""
 
-#: cinder/tests/test_volume_types.py:62
+#: cinder/tests/test_volume_types.py:64
 #, python-format
 msgid "Result data: %s"
 msgstr ""
@@ -3700,6 +3702,17 @@ msgstr ""
 msgid "Invalid input"
 msgstr ""
 
+#: cinder/tests/api/contrib/test_consistencygroups.py:387
+msgid ""
+"Invalid ConsistencyGroup: Consistency group status must be available or "
+"error, but current status is: invalid"
+msgstr ""
+
+#: cinder/tests/api/contrib/test_consistencygroups.py:456
+#, python-format
+msgid "volume_types must be provided to create consistency group %s."
+msgstr ""
+
 #: cinder/tests/api/middleware/test_faults.py:127
 #, python-format
 msgid "String with params: %s"
@@ -3714,6 +3727,10 @@ msgstr ""
 msgid "Value is invalid"
 msgstr ""
 
+#: cinder/tests/brick/test_brick_connector.py:462
+msgid "in fixed duration looping call"
+msgstr ""
+
 #: cinder/tests/brick/test_brick_remotefs.py:100
 msgid "Unexpected call to _execute."
 msgstr ""
@@ -3811,57 +3828,73 @@ msgstr ""
 msgid "Volume %s has been transferred."
 msgstr ""
 
-#: cinder/volume/api.py:161
+#: cinder/volume/api.py:169
 msgid ""
-"Invalid volume_type provided (requested type must be supported by this "
-"consistency group."
+"Invalid volume size provided for create request (size argument must be an"
+" integer (or string represenation or an integer) and greater than zero)."
 msgstr ""
 
-#: cinder/volume/api.py:167
+#: cinder/volume/api.py:177
+msgid ""
+"volume_type must be provided when creating a volume in a consistency "
+"group."
+msgstr ""
+
+#: cinder/volume/api.py:182
+msgid ""
+"Invalid volume_type provided (requested type must be supported by this "
+"consistency group)."
+msgstr ""
+
+#: cinder/volume/api.py:188
 msgid ""
 "Invalid volume_type provided (requested type must match source volume, or"
 " be omitted). You should omit the argument."
 msgstr ""
 
-#: cinder/volume/api.py:174
+#: cinder/volume/api.py:195
 msgid ""
 "No volume_type should be provided when creating test replica, type must "
 "be omitted."
 msgstr ""
 
-#: cinder/volume/api.py:180
+#: cinder/volume/api.py:201
 msgid ""
 "Invalid volume_type provided (requested type must match source snapshot, "
 "or be omitted). You should omit the argument."
 msgstr ""
 
-#: cinder/volume/api.py:219 cinder/volume/api.py:221
+#: cinder/volume/api.py:240 cinder/volume/api.py:242
 msgid "Failed to create api volume flow"
 msgstr ""
 
-#: cinder/volume/api.py:253
+#: cinder/volume/api.py:274
 msgid "Failed to update quota for deleting volume"
 msgstr ""
 
-#: cinder/volume/api.py:265
+#: cinder/volume/api.py:286
 #, python-format
 msgid "Volume status must be available or error, but current status is: %s"
 msgstr ""
 
-#: cinder/volume/api.py:275
+#: cinder/volume/api.py:296
 msgid "Volume cannot be deleted while migrating"
 msgstr ""
 
-#: cinder/volume/api.py:280
+#: cinder/volume/api.py:301
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:403
+#: cinder/volume/api.py:352
+msgid "all_tenants param must be 0 or 1"
+msgstr ""
+
+#: cinder/volume/api.py:447
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:422
+#: cinder/volume/api.py:466
 #, python-format
 msgid ""
 "Unable to detach volume. Volume status must be 'in-use' and attach_status"
@@ -3869,167 +3902,167 @@ msgid ""
 "attach_status: '%(attach_status)s'"
 msgstr ""
 
-#: cinder/volume/api.py:503 cinder/volume/api.py:621
+#: cinder/volume/api.py:547 cinder/volume/api.py:665
 msgid "Snapshot cannot be created while volume is migrating"
 msgstr ""
 
-#: cinder/volume/api.py:508
+#: cinder/volume/api.py:552
 msgid "Snapshot of secondary replica is not allowed."
 msgstr ""
 
-#: cinder/volume/api.py:512
+#: cinder/volume/api.py:556
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:534 cinder/volume/api.py:662
+#: cinder/volume/api.py:578 cinder/volume/api.py:706
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:546 cinder/volume/api.py:674
+#: cinder/volume/api.py:590 cinder/volume/api.py:718
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:625
+#: cinder/volume/api.py:669
 #, python-format
 msgid "Snapshot cannot be created because volume '%s' is not available."
 msgstr ""
 
-#: cinder/volume/api.py:716
+#: cinder/volume/api.py:760
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:764
 #, python-format
 msgid ""
 "Snapshot %s is part of a cgsnapshot and has to be deleted together with "
 "the cgsnapshot."
 msgstr ""
 
-#: cinder/volume/api.py:750 cinder/volume/flows/api/create_volume.py:266
+#: cinder/volume/api.py:794 cinder/volume/flows/api/create_volume.py:266
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:754
+#: cinder/volume/api.py:798
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:758
+#: cinder/volume/api.py:802
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:889 cinder/volume/api.py:982
+#: cinder/volume/api.py:933 cinder/volume/api.py:1026
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:892
+#: cinder/volume/api.py:936
 msgid "Volume status is in-use."
 msgstr ""
 
-#: cinder/volume/api.py:940
+#: cinder/volume/api.py:984
 msgid "Volume status must be available to extend."
 msgstr ""
 
-#: cinder/volume/api.py:945
+#: cinder/volume/api.py:989
 #, python-format
 msgid ""
 "New size for extend must be greater than current size. (current: "
 "%(size)s, extended: %(new_size)s)"
 msgstr ""
 
-#: cinder/volume/api.py:960
+#: cinder/volume/api.py:1004
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to extend volume by %(s_size)sG, "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)."
 msgstr ""
 
-#: cinder/volume/api.py:988
+#: cinder/volume/api.py:1032
 msgid "Volume is already part of an active migration"
 msgstr ""
 
-#: cinder/volume/api.py:994
+#: cinder/volume/api.py:1038
 msgid "volume must not have snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:1001 cinder/volume/manager.py:1448
+#: cinder/volume/api.py:1045 cinder/volume/manager.py:1450
 msgid "Volume must not be replicated."
 msgstr ""
 
-#: cinder/volume/api.py:1007 cinder/volume/api.py:1107
+#: cinder/volume/api.py:1051 cinder/volume/api.py:1151
 msgid "Volume must not be part of a consistency group."
 msgstr ""
 
-#: cinder/volume/api.py:1023
+#: cinder/volume/api.py:1067
 #, python-format
 msgid "No available service named %s"
 msgstr ""
 
-#: cinder/volume/api.py:1029
+#: cinder/volume/api.py:1073
 msgid "Destination host must be different than current host"
 msgstr ""
 
-#: cinder/volume/api.py:1059
+#: cinder/volume/api.py:1103
 msgid "Source volume not mid-migration."
 msgstr ""
 
-#: cinder/volume/api.py:1063
+#: cinder/volume/api.py:1107
 msgid "Destination volume not mid-migration."
 msgstr ""
 
-#: cinder/volume/api.py:1068
+#: cinder/volume/api.py:1112
 #, python-format
 msgid "Destination has migration_status %(stat)s, expected %(exp)s."
 msgstr ""
 
-#: cinder/volume/api.py:1079
+#: cinder/volume/api.py:1123
 msgid "Volume status must be available to update readonly flag."
 msgstr ""
 
-#: cinder/volume/api.py:1088
-#, python-format
-msgid "Unable to update type due to incorrect status on volume: %s"
-msgstr ""
-
-#: cinder/volume/api.py:1094
-#, python-format
-msgid "Volume %s is already part of an active migration."
-msgstr ""
-
-#: cinder/volume/api.py:1100
-#, python-format
-msgid "migration_policy must be 'on-demand' or 'never', passed: %s"
-msgstr ""
-
-#: cinder/volume/api.py:1119
-#, python-format
-msgid "Invalid volume_type passed: %s"
-msgstr ""
-
 #: cinder/volume/api.py:1132
 #, python-format
+msgid "Unable to update type due to incorrect status on volume: %s"
+msgstr ""
+
+#: cinder/volume/api.py:1138
+#, python-format
+msgid "Volume %s is already part of an active migration."
+msgstr ""
+
+#: cinder/volume/api.py:1144
+#, python-format
+msgid "migration_policy must be 'on-demand' or 'never', passed: %s"
+msgstr ""
+
+#: cinder/volume/api.py:1163
+#, python-format
+msgid "Invalid volume_type passed: %s"
+msgstr ""
+
+#: cinder/volume/api.py:1176
+#, python-format
 msgid "New volume_type same as original: %s"
 msgstr ""
 
-#: cinder/volume/api.py:1147
+#: cinder/volume/api.py:1191
 msgid "Retype cannot change encryption requirements"
 msgstr ""
 
-#: cinder/volume/api.py:1159
+#: cinder/volume/api.py:1203
 msgid "Retype cannot change front-end qos specs for in-use volumes"
 msgstr ""
 
-#: cinder/volume/api.py:1192
+#: cinder/volume/api.py:1236
 msgid "Unable to find service for given host."
 msgstr ""
 
 #: cinder/volume/driver.py:231 cinder/volume/drivers/hds/nfs.py:352
-#: cinder/volume/drivers/netapp/nfs.py:177
+#: cinder/volume/drivers/netapp/nfs.py:186
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
@@ -4095,22 +4128,20 @@ msgstr ""
 
 #: cinder/volume/driver.py:854
 #: cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py:150
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:155
-#: cinder/volume/targets/iscsi.py:130
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: cinder/volume/driver.py:867 cinder/volume/targets/iscsi.py:143
+#: cinder/volume/driver.py:867
 #, python-format
 msgid "ISCSI discovery attempt failed for:%s"
 msgstr ""
 
-#: cinder/volume/driver.py:916 cinder/volume/targets/iscsi.py:78
+#: cinder/volume/driver.py:916
 #, python-format
 msgid "Could not find iSCSI export for volume %s"
 msgstr ""
 
-#: cinder/volume/driver.py:1018 cinder/volume/targets/iscsi.py:185
+#: cinder/volume/driver.py:1018
 msgid "The volume driver requires the iSCSI initiator name in the connector."
 msgstr ""
 
@@ -4126,13 +4157,12 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/iscsi.py:69 cinder/volume/iscsi.py:95
-#: cinder/volume/iscsi.py:240 cinder/volume/targets/lio.py:39
-#: cinder/volume/targets/tgt.py:275
+#: cinder/volume/iscsi.py:240
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s"
 msgstr ""
 
-#: cinder/volume/iscsi.py:84 cinder/volume/targets/tgt.py:290
+#: cinder/volume/iscsi.py:84
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
@@ -4143,7 +4173,7 @@ msgstr ""
 msgid "Detected inconsistency in provider_location id"
 msgstr ""
 
-#: cinder/volume/iscsi.py:258 cinder/volume/targets/lio.py:58
+#: cinder/volume/iscsi.py:258
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provision for volume: %s"
 msgstr ""
@@ -4236,7 +4266,7 @@ msgstr ""
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:543 cinder/volume/manager.py:1828
+#: cinder/volume/manager.py:543 cinder/volume/manager.py:1834
 #, python-format
 msgid ""
 "Failed updating %(snapshot_id)s metadata using the provided volumes "
@@ -4258,7 +4288,7 @@ msgstr ""
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:618 cinder/volume/manager.py:1928
+#: cinder/volume/manager.py:618 cinder/volume/manager.py:1934
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
@@ -4310,212 +4340,212 @@ msgid ""
 "%(model)s during xfr."
 msgstr ""
 
-#: cinder/volume/manager.py:1016
+#: cinder/volume/manager.py:1018
 msgid "failed to create new_volume on destination host"
 msgstr ""
 
-#: cinder/volume/manager.py:1019
+#: cinder/volume/manager.py:1021
 msgid "timeout creating new_volume on destination host"
 msgstr ""
 
-#: cinder/volume/manager.py:1042
+#: cinder/volume/manager.py:1044
 #, python-format
 msgid "Failed to copy volume %(vol1)s to %(vol2)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1071
+#: cinder/volume/manager.py:1073
 #, python-format
 msgid ""
 "migrate_volume_completion: completing migration for volume %(vol1)s "
 "(temporary volume %(vol2)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1083
+#: cinder/volume/manager.py:1085
 #, python-format
 msgid ""
 "migrate_volume_completion is cleaning up an error for volume %(vol1)s "
 "(temporary volume %(vol2)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1104
+#: cinder/volume/manager.py:1106
 #, python-format
 msgid "Failed to delete migration source vol %(vol)s: %(err)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1190
+#: cinder/volume/manager.py:1192
 msgid "Updating volume status"
 msgstr ""
 
-#: cinder/volume/manager.py:1198
+#: cinder/volume/manager.py:1200
 #, python-format
 msgid ""
 "Unable to update stats, %(driver_name)s -%(driver_version)s "
 "%(config_group)s driver is uninitialized."
 msgstr ""
 
-#: cinder/volume/manager.py:1234
+#: cinder/volume/manager.py:1236
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
 
-#: cinder/volume/manager.py:1302
+#: cinder/volume/manager.py:1304
 #, python-format
 msgid "volume %s: extending"
 msgstr ""
 
-#: cinder/volume/manager.py:1304
+#: cinder/volume/manager.py:1306
 #, python-format
 msgid "volume %s: extended successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1306
+#: cinder/volume/manager.py:1308
 #, python-format
 msgid "volume %s: Error trying to extend volume"
 msgstr ""
 
-#: cinder/volume/manager.py:1311
+#: cinder/volume/manager.py:1313
 #, python-format
 msgid "Volume %s: Error trying to extend volume"
 msgstr ""
 
-#: cinder/volume/manager.py:1385
+#: cinder/volume/manager.py:1387
 msgid "Failed to update usages while retyping volume."
 msgstr ""
 
-#: cinder/volume/manager.py:1386
+#: cinder/volume/manager.py:1388
 msgid "Failed to get old volume type quota reservations"
 msgstr ""
 
-#: cinder/volume/manager.py:1417
+#: cinder/volume/manager.py:1419
 #, python-format
 msgid "Volume %s: retyped successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1420
+#: cinder/volume/manager.py:1422
 #, python-format
 msgid ""
 "Volume %s: driver error when trying to retype, falling back to generic "
 "mechanism."
 msgstr ""
 
-#: cinder/volume/manager.py:1431
+#: cinder/volume/manager.py:1433
 msgid "Retype requires migration but is not allowed."
 msgstr ""
 
-#: cinder/volume/manager.py:1439
+#: cinder/volume/manager.py:1441
 msgid "Volume must not have snapshots."
 msgstr ""
 
-#: cinder/volume/manager.py:1487
+#: cinder/volume/manager.py:1489
 msgid "Failed to create manage_existing flow."
 msgstr ""
 
-#: cinder/volume/manager.py:1489
+#: cinder/volume/manager.py:1491
 msgid "Failed to create manage existing flow."
 msgstr ""
 
-#: cinder/volume/manager.py:1519
+#: cinder/volume/manager.py:1521
 #, python-format
 msgid "Failed to promote replica for volume %(id)s."
 msgstr ""
 
-#: cinder/volume/manager.py:1528
+#: cinder/volume/manager.py:1530
 msgid "Error promoting secondary volume to primary"
 msgstr ""
 
-#: cinder/volume/manager.py:1538 cinder/volume/manager.py:1569
+#: cinder/volume/manager.py:1540 cinder/volume/manager.py:1571
 #, python-format
 msgid "Failed updating model with driver provided model %(model)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1550
+#: cinder/volume/manager.py:1552
 #, python-format
 msgid "Failed to sync replica for volume %(id)s."
 msgstr ""
 
-#: cinder/volume/manager.py:1559
+#: cinder/volume/manager.py:1561
 msgid "Error synchronizing secondary volume to primary"
 msgstr ""
 
-#: cinder/volume/manager.py:1577
+#: cinder/volume/manager.py:1579
 msgid "Updating volume replication status."
 msgstr ""
 
-#: cinder/volume/manager.py:1585
+#: cinder/volume/manager.py:1587
 #, python-format
 msgid ""
 "Unable to update volume replication status, %(driver_name)s "
 "-%(driver_version)s %(config_group)s driver is uninitialized."
 msgstr ""
 
-#: cinder/volume/manager.py:1603
+#: cinder/volume/manager.py:1605
 #, python-format
 msgid "Error checking replication status for volume %s"
 msgstr ""
 
-#: cinder/volume/manager.py:1621
+#: cinder/volume/manager.py:1623
 #, python-format
 msgid "Consistency group %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:1635
+#: cinder/volume/manager.py:1637
 #, python-format
 msgid "Consistency group %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:1643
+#: cinder/volume/manager.py:1645
 #, python-format
 msgid "Consistency group %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1662
+#: cinder/volume/manager.py:1664
 #, python-format
 msgid "Consistency group %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:1672
+#: cinder/volume/manager.py:1678
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:1700
+#: cinder/volume/manager.py:1706
 #, python-format
 msgid "Error occurred when deleting consistency group %s."
 msgstr ""
 
-#: cinder/volume/manager.py:1723
+#: cinder/volume/manager.py:1729
 msgid "Failed to update usages deleting consistency groups."
 msgstr ""
 
-#: cinder/volume/manager.py:1740
+#: cinder/volume/manager.py:1746
 msgid "Failed to update usages deleting volume."
 msgstr ""
 
-#: cinder/volume/manager.py:1758
+#: cinder/volume/manager.py:1764
 #, python-format
 msgid "Consistency group %s: deleted successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:1771
+#: cinder/volume/manager.py:1777
 #, python-format
 msgid "Cgsnapshot %s: creating."
 msgstr ""
 
-#: cinder/volume/manager.py:1846
+#: cinder/volume/manager.py:1852
 #, python-format
 msgid "cgsnapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1859
+#: cinder/volume/manager.py:1865
 #, python-format
 msgid "cgsnapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:1894
+#: cinder/volume/manager.py:1900
 #, python-format
 msgid "Error occurred when deleting cgsnapshot %s."
 msgstr ""
 
-#: cinder/volume/manager.py:1939
+#: cinder/volume/manager.py:1945
 #, python-format
 msgid "cgsnapshot %s: deleted successfully"
 msgstr ""
@@ -4654,36 +4684,43 @@ msgstr ""
 msgid "Error message is empty."
 msgstr ""
 
-#: cinder/volume/drivers/coraid.py:386
+#: cinder/volume/drivers/coraid.py:391
 msgid "Cannot create clone volume in different repository."
 msgstr ""
 
 #: cinder/volume/drivers/datera.py:88
 #, python-format
 msgid ""
-"Tried to delete volume %s, but was not found in Datera cluster. "
+"Tried to delete volume %s, but it was not found in the Datera cluster. "
 "Continuing with delete."
 msgstr ""
 
-#: cinder/volume/drivers/datera.py:121
+#: cinder/volume/drivers/datera.py:122
+#, python-format
+msgid ""
+"Tried to delete export for volume %s, but it was not found in the Datera "
+"cluster. Continuing with volume detach"
+msgstr ""
+
+#: cinder/volume/drivers/datera.py:131
 #, python-format
 msgid ""
 "Tried to delete snapshot %s, but was not found in Datera cluster. "
 "Continuing with delete."
 msgstr ""
 
-#: cinder/volume/drivers/datera.py:171
+#: cinder/volume/drivers/datera.py:181
 msgid "Failed to get updated stats from Datera Cluster."
 msgstr ""
 
-#: cinder/volume/drivers/datera.py:234
+#: cinder/volume/drivers/datera.py:244
 #, python-format
 msgid ""
 "Failed to make a request to Datera cluster endpoint due to the following "
 "reason: %s"
 msgstr ""
 
-#: cinder/volume/drivers/datera.py:245
+#: cinder/volume/drivers/datera.py:255
 #, python-format
 msgid "Request to Datera cluster returned bad status: %(status)s | %(reason)s"
 msgstr ""
@@ -4853,7 +4890,7 @@ msgid "Delete Volume: %(volume)s"
 msgstr ""
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:519
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1998
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1989
 #, python-format
 msgid "Volume %(name)s not found on the array. No volume to delete."
 msgstr ""
@@ -4873,7 +4910,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:577
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1705
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1863
 #, python-format
 msgid "Create snapshot: %(snapshot)s: volume: %(volume)s"
 msgstr ""
@@ -4976,7 +5013,7 @@ msgid "Volume %s is not mapped. No volume to unmap."
 msgstr ""
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:978
-#: cinder/volume/drivers/emc/emc_vmax_common.py:354
+#: cinder/volume/drivers/emc/emc_vmax_common.py:352
 #, python-format
 msgid "Initialize connection: %(volume)s"
 msgstr ""
@@ -4987,7 +5024,7 @@ msgid "Volume %s is already mapped."
 msgstr ""
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:996
-#: cinder/volume/drivers/emc/emc_vmax_common.py:421
+#: cinder/volume/drivers/emc/emc_vmax_common.py:412
 #, python-format
 msgid "Terminate connection: %(volume)s"
 msgstr ""
@@ -5020,7 +5057,7 @@ msgid "Snap pool not found."
 msgstr ""
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1219
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1190
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1181
 msgid "Cannot connect to ECOM server"
 msgstr ""
 
@@ -5042,7 +5079,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1397
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1347
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1338
 #: cinder/volume/drivers/emc/emc_vmax_masking.py:448
 #, python-format
 msgid "Error finding %s."
@@ -5056,11 +5093,11 @@ msgstr ""
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1427
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1491
-#: cinder/volume/drivers/emc/emc_vmax_common.py:984
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1042
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1430
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1737
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2069
+#: cinder/volume/drivers/emc/emc_vmax_common.py:975
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1033
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1421
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1728
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2060
 #: cinder/volume/drivers/emc/emc_vmax_fast.py:512
 #: cinder/volume/drivers/emc/emc_vmax_fast.py:654
 #: cinder/volume/drivers/emc/emc_vmax_masking.py:208
@@ -5249,138 +5286,83 @@ msgstr ""
 msgid "Failed to refresh mounts, reason=%s"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:184
-#, python-format
-msgid "Cloning volume %(src)s to volume %(dst)s"
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:189
-msgid "Volume status must be 'available'."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:225 cinder/volume/drivers/remotefs.py:115
-#: cinder/volume/drivers/netapp/nfs.py:788
+#: cinder/volume/drivers/glusterfs.py:179 cinder/volume/drivers/remotefs.py:115
+#: cinder/volume/drivers/netapp/nfs.py:817
 #, python-format
 msgid "casted to %s"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:239
-msgid "Snapshot status must be \"available\" to clone."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:298 cinder/volume/drivers/remotefs.py:165
+#: cinder/volume/drivers/glusterfs.py:233 cinder/volume/drivers/remotefs.py:167
 #, python-format
 msgid "Volume %s does not have provider_location specified, skipping"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:406
-#, python-format
-msgid "Volume status must be \"available\" or \"in-use\" for snapshot. (is %s)"
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:438
-msgid "Call to Nova to create snapshot failed"
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:460
-msgid "Nova returned \"error\" status while creating snapshot."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:477
-#, python-format
-msgid "Timed out while waiting for Nova update for creation of snapshot %s."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:575
-msgid "Volume status must be \"available\" or \"in-use\"."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:591
-#, python-format
-msgid ""
-"Snapshot record for %s is not present, allowing snapshot_delete to "
-"proceed."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:617
-#, python-format
-msgid "No backing file found for %s, allowing snapshot to be deleted."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:694
-#, python-format
-msgid "No file found with %s as backing file."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:704
-#, python-format
-msgid "No snap found with %s as backing file."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:741
-#, python-format
-msgid "Check condition failed: %s expected to be None."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:792
+#: cinder/volume/drivers/glusterfs.py:312
 msgid "Call to Nova delete snapshot failed"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:816
+#: cinder/volume/drivers/glusterfs.py:336
 #, python-format
 msgid "Unable to delete snapshot %(id)s, status: %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:829
+#: cinder/volume/drivers/glusterfs.py:349
 #, python-format
 msgid "Timed out while waiting for Nova update for deletion of snapshot %(id)s."
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:854
-#, python-format
-msgid "Deleting stale snapshot: %s"
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:895
+#: cinder/volume/drivers/glusterfs.py:398
 #, python-format
 msgid "%s must be a valid raw or qcow2 image."
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:953
+#: cinder/volume/drivers/glusterfs.py:424 cinder/volume/drivers/smbfs.py:442
 msgid "Extend volume is only supported for this driver when no snapshots exist."
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:961
+#: cinder/volume/drivers/glusterfs.py:432
 #, python-format
 msgid "Unrecognized backing format: %s"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:979
+#: cinder/volume/drivers/glusterfs.py:450
 #, python-format
 msgid "file already exists at %s"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:1005
-#: cinder/volume/drivers/remotefs.py:152
+#: cinder/volume/drivers/glusterfs.py:476 cinder/volume/drivers/remotefs.py:152
 #, python-format
 msgid "Exception during mounting %s"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:1077
+#: cinder/volume/drivers/glusterfs.py:548
 msgid "Backup is not supported for GlusterFS volumes with snapshots."
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:1092
+#: cinder/volume/drivers/glusterfs.py:563
 #, python-format
 msgid ""
 "No snapshots found in database, but %(path)s has backing file "
 "%(backing_file)s!"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:1100
+#: cinder/volume/drivers/glusterfs.py:571
 msgid "Backup is only supported for raw-formatted GlusterFS volumes."
 msgstr ""
 
+#: cinder/volume/drivers/glusterfs.py:600
+msgid "Call to Nova to create snapshot failed"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:622
+msgid "Nova returned \"error\" status while creating snapshot."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:639
+#, python-format
+msgid "Timed out while waiting for Nova update for creation of snapshot %s."
+msgstr ""
+
 #: cinder/volume/drivers/lvm.py:153
 #, python-format
 msgid "Volume device file path %s does not exist."
@@ -5412,7 +5394,7 @@ msgid "Failed to rename logical volume %(name)s, error message was: %(err_msg)s"
 msgstr ""
 
 #: cinder/volume/drivers/lvm.py:436 cinder/volume/drivers/rbd.py:907
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:384
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:403
 msgid "Reference must contain source-name element."
 msgstr ""
 
@@ -5453,12 +5435,13 @@ msgstr ""
 msgid "NFS config 'nfs_used_ratio' invalid.  Must be > 0 and <= 1.0: %s"
 msgstr ""
 
-#: cinder/volume/drivers/nfs.py:249 cinder/volume/drivers/netapp/nfs.py:612
+#: cinder/volume/drivers/nfs.py:249 cinder/volume/drivers/smbfs.py:403
+#: cinder/volume/drivers/netapp/nfs.py:620
 #, python-format
 msgid "Extending volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/nfs.py:257
+#: cinder/volume/drivers/nfs.py:257 cinder/volume/drivers/smbfs.py:410
 #, python-format
 msgid "Resizing file to %sG..."
 msgstr ""
@@ -5472,7 +5455,7 @@ msgid "Unexpected response from Nimble API"
 msgstr ""
 
 #: cinder/volume/drivers/nimble.py:90
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:88
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:90
 #, python-format
 msgid "%s is not set."
 msgstr ""
@@ -5800,37 +5783,91 @@ msgstr ""
 msgid "Failed to Extend Volume %(volname)s"
 msgstr ""
 
-#: cinder/volume/drivers/remotefs.py:256
+#: cinder/volume/drivers/remotefs.py:267 cinder/volume/drivers/smbfs.py:522
 #, python-format
 msgid "Expected volume size was %d"
 msgstr ""
 
-#: cinder/volume/drivers/remotefs.py:257
+#: cinder/volume/drivers/remotefs.py:268
 #, python-format
 msgid " but size is now %d"
 msgstr ""
 
-#: cinder/volume/drivers/remotefs.py:293
+#: cinder/volume/drivers/remotefs.py:304
 #, python-format
 msgid "Share %s ignored due to invalid format.  Must be of form address:/export."
 msgstr ""
 
-#: cinder/volume/drivers/remotefs.py:354
+#: cinder/volume/drivers/remotefs.py:365
 #, python-format
 msgid "%s is already mounted"
 msgstr ""
 
-#: cinder/volume/drivers/remotefs.py:404
+#: cinder/volume/drivers/remotefs.py:422
 msgid "'active' must be present when writing snap_info."
 msgstr ""
 
-#: cinder/volume/drivers/remotefs.py:525
+#: cinder/volume/drivers/remotefs.py:548
 #, python-format
 msgid ""
 "Share at %(dir)s is not writable by the Cinder volume service. Snapshot "
 "operations will not be supported."
 msgstr ""
 
+#: cinder/volume/drivers/remotefs.py:601
+#, python-format
+msgid "Cloning volume %(src)s to volume %(dst)s"
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:606
+msgid "Volume status must be 'available'."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:645
+#, python-format
+msgid "Deleting stale snapshot: %s"
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:669
+msgid "Volume status must be \"available\" or \"in-use\"."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:685
+#, python-format
+msgid ""
+"Snapshot record for %s is not present, allowing snapshot_delete to "
+"proceed."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:711
+#, python-format
+msgid "No backing file found for %s, allowing snapshot to be deleted."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:782
+#, python-format
+msgid "No file found with %s as backing file."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:791
+#, python-format
+msgid "No snap found with %s as backing file."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:820
+#, python-format
+msgid "Check condition failed: %s expected to be None."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:835
+msgid "Snapshot status must be \"available\" to clone."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:964
+#, python-format
+msgid "Volume status must be \"available\" or \"in-use\" for snapshot. (is %s)"
+msgstr ""
+
 #: cinder/volume/drivers/scality.py:68
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
@@ -5862,6 +5899,74 @@ msgstr ""
 msgid "Sheepdog is not working"
 msgstr ""
 
+#: cinder/volume/drivers/smbfs.py:131
+msgid "SMBFS config file not set (smbfs_shares_config)."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:135
+#, python-format
+msgid "SMBFS config file at %(config)s doesn't exist."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:140
+#, python-format
+msgid "Invalid mount point base: %s"
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:144
+#, python-format
+msgid "SMBFS config 'smbfs_oversub_ratio' invalid.  Must be > 0: %s"
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:153
+#, python-format
+msgid "SMBFS config 'smbfs_used_ratio' invalid.  Must be > 0 and <= 1.0: %s"
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:204 cinder/volume/drivers/ibm/ibmnas.py:287
+#, python-format
+msgid "Volume %s does not have provider_location specified, skipping."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:226
+msgid "qemu-img is not installed."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:238
+msgid ""
+"This version of qemu-img does not support vhdx images. Please upgrade to "
+"1.7 or greater."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:258
+#, python-format
+msgid "File already exists at %s."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:375
+msgid "This driver does not support snapshotting in-use volumes."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:379
+msgid "This driver does not support deleting in-use snapshots."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:391
+#, python-format
+msgid "Snapshots are not supported for this volume format: %s"
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:505
+msgid ""
+"Unsupported volume format: vhdx. qemu-img 1.7 or higher is required in "
+"order to properly support this format."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:523
+#, python-format
+msgid " but size is now %d."
+msgstr ""
+
 #: cinder/volume/drivers/solidfire.py:153
 #, python-format
 msgid ""
@@ -6058,7 +6163,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/emc/emc_vmax_common.py:179
-#: cinder/volume/drivers/emc/emc_vmax_common.py:903
+#: cinder/volume/drivers/emc/emc_vmax_common.py:894
 #, python-format
 msgid ""
 "Adding volume: %(volumeName)s to default storage group for FAST policy: "
@@ -6066,8 +6171,8 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/emc/emc_vmax_common.py:188
-#: cinder/volume/drivers/emc/emc_vmax_common.py:917
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1961
+#: cinder/volume/drivers/emc/emc_vmax_common.py:908
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1952
 #, python-format
 msgid ""
 "Unable to create or get default storage group for FAST policy: "
@@ -6103,90 +6208,85 @@ msgid ""
 "%(storage_system)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:362
+#: cinder/volume/drivers/emc/emc_vmax_common.py:360
 #, python-format
 msgid ""
 "Volume %(volume)s is already mapped. The device number is  "
 "%(deviceNumber)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:377
+#: cinder/volume/drivers/emc/emc_vmax_common.py:375
 #, python-format
 msgid "Error Attaching volume %(vol)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:397
-#, python-format
-msgid "Unable to get iscsi IP address for storagesystem %(storageSystem)s"
-msgstr ""
-
-#: cinder/volume/drivers/emc/emc_vmax_common.py:445
+#: cinder/volume/drivers/emc/emc_vmax_common.py:436
 #, python-format
 msgid "Cannot find Volume: %(volumename)s. Extend operation.  Exiting...."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:452
+#: cinder/volume/drivers/emc/emc_vmax_common.py:443
 #, python-format
 msgid ""
 "Your original size: %(originalVolumeSize)s GB is greater than: "
 "%(newSize)s GB. Only Extend is supported. Exiting..."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:469
+#: cinder/volume/drivers/emc/emc_vmax_common.py:460
 #, python-format
 msgid ""
 "Volume: %(volumeName)s is not a concatenated volume. You can only perform"
 " extend on concatenated volume. Exiting..."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:504
+#: cinder/volume/drivers/emc/emc_vmax_common.py:495
 msgid "Error Creating unbound volume on an Extend operation"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:515
+#: cinder/volume/drivers/emc/emc_vmax_common.py:506
 #, python-format
 msgid ""
 "On an Extend Operation, error adding volume to composite volume: "
 "%(volumename)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:539
+#: cinder/volume/drivers/emc/emc_vmax_common.py:530
 #, python-format
 msgid ""
 "The requested size : %(requestedSize)s is not the same as resulting size:"
 " %(resultSize)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:575
+#: cinder/volume/drivers/emc/emc_vmax_common.py:566
 #, python-format
 msgid "PoolName %(poolName)s must be in the file %(emcConfigFileName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:582
+#: cinder/volume/drivers/emc/emc_vmax_common.py:573
 #, python-format
 msgid ""
 "Array Serial Number %(arrayName)s must be in the file "
 "%(emcConfigFileName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:677
+#: cinder/volume/drivers/emc/emc_vmax_common.py:668
 #, python-format
 msgid "Migrating using retype Volume: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:685
+#: cinder/volume/drivers/emc/emc_vmax_common.py:676
 #, python-format
 msgid "Volume %(name)s not found on the array. No volume to migrate using retype."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:697
+#: cinder/volume/drivers/emc/emc_vmax_common.py:688
 #, python-format
 msgid ""
 "Volume %(name)s is not suitable for storage assisted migration using "
 "retype"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:725
+#: cinder/volume/drivers/emc/emc_vmax_common.py:716
 msgid ""
 "The VMAX plugin only supports Retype.  If a pool based migration is "
 "necessary this will happen on a Retype From the command line: cinder "
@@ -6194,155 +6294,155 @@ msgid ""
 "policy on-demand"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:759
+#: cinder/volume/drivers/emc/emc_vmax_common.py:750
 #, python-format
 msgid ""
 "Failed to migrate: %(volumeName)s from default source storage group for "
 "FAST policy: %(sourceFastPolicyName)s Attempting cleanup... "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:785
+#: cinder/volume/drivers/emc/emc_vmax_common.py:776
 #, python-format
 msgid ""
 "Attempting a rollback of: %(volumeName)s to original pool "
 "%(sourcePoolInstanceName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:816
+#: cinder/volume/drivers/emc/emc_vmax_common.py:807
 #, python-format
 msgid "_migrate_rollback on : %(volumeName)s from "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:827
+#: cinder/volume/drivers/emc/emc_vmax_common.py:818
 #, python-format
 msgid ""
 "Failed to return volume %(volumeName)s to original storage pool. Please "
 "contact your system administrator to return it to the correct location "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:854
+#: cinder/volume/drivers/emc/emc_vmax_common.py:845
 #, python-format
 msgid "_migrate_cleanup on : %(volumeName)s from "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:930
+#: cinder/volume/drivers/emc/emc_vmax_common.py:921
 #, python-format
 msgid ""
 "Failed to verify that volume was added to storage group for FAST policy: "
 "%(fastPolicyName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:971
+#: cinder/volume/drivers/emc/emc_vmax_common.py:962
 #, python-format
 msgid "Error finding targe pool instance name for pool: %(targetPoolName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:985
+#: cinder/volume/drivers/emc/emc_vmax_common.py:976
 #, python-format
 msgid ""
 "Error migrating volume: %(volumename)s. to target pool  "
 "%(targetPoolName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1000
+#: cinder/volume/drivers/emc/emc_vmax_common.py:991
 #, python-format
 msgid ""
 "Volume : %(volumeName)s. was not successfully migrated to target pool "
 "%(targetPoolName)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1043
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1034
 #, python-format
 msgid ""
 "Failed to remove: %(volumename)s. from the default storage group for FAST"
 " policy %(fastPolicyName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1053
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2020
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1044
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2011
 #, python-format
 msgid ""
 "The volume: %(volumename)s. was not first part of the default storage "
 "group for FAST policy %(fastPolicyName)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1083
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1074
 #, python-format
 msgid ""
 "Failed to add %(volumeName)s to default storage group for fast policy "
 "%(fastPolicyName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1108
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1099
 msgid "Error getting target pool name and array"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1120
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1111
 msgid "Error parsing target pool name, array, and fast policy"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1124
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1115
 #, python-format
 msgid ""
 "The source array : %(sourceArraySerialNumber)s does not match the target "
 "array: %(targetArraySerialNumber)sskipping storage-assisted migration"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1140
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1131
 #, python-format
 msgid ""
 "No action required. Volume : %(volumeName)s is already part of pool : "
 "%(pool)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1150
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1141
 msgid "Only available volumes can be migrated between different protocols"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1211
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1202
 #, python-format
 msgid "StorageSystem %(array)s is not found."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1248
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1239
 #, python-format
 msgid "Pool %(poolNameInStr)s is not found."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1254
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1245
 #, python-format
 msgid "Storage system not found for pool %(poolNameInStr)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1431
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1422
 #, python-format
 msgid "Unable to get target endpoints for hardwareId %(hardwareIdInstance)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1449
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1440
 #, python-format
 msgid "Target end points do not exist for hardware Id : %(hardwareIdInstance)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1525
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1516
 #, python-format
 msgid "Configuration file %(configurationFile)s does not exist "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1574
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1565
 msgid ""
 "The pool cannot be null. The pool must be configured either in the extra "
 "specs or in the EMC configuration file corresponding to the Volume Type. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1585
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1576
 msgid ""
 "The array cannot be null. The pool must be configured either as a cinder "
 "extra spec for multi-backend or in the EMC configuration file for the "
 "default case "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1617
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1608
 msgid ""
 "Unable to get configuration information necessary to create a volume. "
 "Please check that there is a configuration file for each config group, if"
@@ -6350,39 +6450,39 @@ msgid ""
 "/etc/cinder/cinder_emc_config_<CONFIG_GROUP>.xml"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1640
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1631
 msgid "You must supply an array in your EMC configuration file "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1646
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1637
 msgid "Cannot get necessary pool or storage system information "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1726
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1717
 #, python-format
 msgid ""
 "Error adding Volume: %(volumeName)s.  with instance path: "
 "%(volumeInstancePath)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1738
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1729
 #, python-format
 msgid "Rolling back %(volumeName)s by deleting it. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1844
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1835
 #, python-format
 msgid "Unable to determine whether %(volumeName)s is composite or not "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1893
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1884
 #, python-format
 msgid ""
 "Create a Clone from Volume: Clone Volume: %(cloneName)s  Source Volume: "
 "%(sourceName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2060
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2051
 #, python-format
 msgid ""
 "Failed to Roll back to re-add volume %(volumeName)s to default storage "
@@ -6390,12 +6490,12 @@ msgid ""
 " get the volume returned to the default storage group"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2070
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2061
 #, python-format
 msgid "Failed to delete volume %(volumeName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2092
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2083
 #, python-format
 msgid ""
 "Pre check for deletion Volume: %(volumeName)s is part of a storage group "
@@ -6492,47 +6592,55 @@ msgstr ""
 msgid "Storage group not associated with the policy %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:147
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:53
+msgid "iscsi_ip_address is not set."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:148
 #, python-format
 msgid "Leaving initialize_connection: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:162
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:156
+msgid "ISCSI provider_location not stored, using discovery."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:163
 #, python-format
 msgid "smis_do_iscsi_discovery is: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:191
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:192
 #, python-format
 msgid "Could not find iSCSI export  for volume %(volumeName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:201
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:202
 #, python-format
 msgid "Cannot find device number for volume %(volumeName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:208
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:209
 #, python-format
 msgid "location is: %(location)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:220
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:221
 #, python-format
 msgid "ISCSI properties: %(properties)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:222
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:223
 #, python-format
 msgid "ISCSI volume is: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:227
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:228
 #, python-format
 msgid "AUTH properties: %(authProps)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:237
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:238
 #, python-format
 msgid "AUTH properties: %s"
 msgstr ""
@@ -6882,7 +6990,7 @@ msgstr ""
 msgid "Cannot get storage system"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:638
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:622
 msgid "Port Group name not found."
 msgstr ""
 
@@ -6890,343 +6998,423 @@ msgstr ""
 msgid "Fast Policy not found."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:199
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:203
 #, python-format
 msgid "naviseccli_path: Could not find NAVISECCLI tool %(path)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:209
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:213
 msgid "san_secondary_ip is configured as the same value as san_ip."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:213
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:217
 msgid "san_ip: Mandatory field configuration. san_ip is not set."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:227
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:231
 #, python-format
 msgid "Invalid VNX authentication type: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:234
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:238
 #, python-format
 msgid "Using security file in %s for authentication"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:242
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:246
 msgid "Plain text credentials are being used for authentication"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:245
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:249
 msgid ""
 "Neither security file nor plain text credentials are specified. Security "
 "file under home directory will be used for authentication if present."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:254
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:258
 #, python-format
 msgid "iscsi_initiators: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:308
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:313
 #, python-format
-msgid "Failed to enable compression on lun: %s"
+msgid "Error on enable compression on lun %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:317
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:324
+#, python-format
+msgid "Error on adding lun to consistency group. %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:334
 #, python-format
 msgid "LUN already exists, LUN name %(name)s. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:345
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:362
 #, python-format
 msgid "LUN is already deleted, LUN name %(name)s. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:371
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:388
 #, python-format
 msgid "CommandLineHelper._wait_for_condition: %s timeout"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:392
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:409
 #, python-format
 msgid "LUN %(name)s is already expanded. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:450
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:466
+#, python-format
+msgid "Consistency group %(name)s already exists. Message: %(msg)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:505
+#, python-format
+msgid "Can not add the lun %(lun)s to consistency group %(cg_name)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:535
+#, python-format
+msgid "CG %(cg_name)s does not exist. Message: %(msg)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:539
+#, python-format
+msgid "CG %(cg_name)s is deleting. Message: %(msg)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:545
+#, python-format
+msgid "Consistency group %s was deleted successfully."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:565
+#, python-format
+msgid "Cgsnapshot name %(name)s already exists. Message: %(msg)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:583
+#, python-format
+msgid "Snapshot %(name)s for consistency group does not exist. Message: %(msg)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:604
 #, python-format
 msgid "Snapshot %(name)s already exists. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:456
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:610
 #, python-format
-msgid "Failed to get LUN ID for volume %s"
+msgid "Failed to get LUN ID for volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:470
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:624
 #, python-format
 msgid "Snapshot %(name)s may deleted already. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:477
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:631
 #, python-format
 msgid "Snapshot %(name)s is in use, retry. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:484
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:638
 #, python-format
 msgid "Snapshot %s was deleted successfully."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:504
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:658
 #, python-format
 msgid "Mount point %(name)s already exists. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:523
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:677
 #, python-format
 msgid ""
 "Snapshot %(snapname)s is attached to snapshot mount point %(mpname)s "
 "already. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:577
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:731
 #, python-format
 msgid ""
 "Migration command may get network timeout. Double check whether migration"
 " in fact started successfully. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:588
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:742
 #, python-format
 msgid "Start migration failed. Message: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:614
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:768
 msgid "Querying migrating status error."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:671
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:825
 #, python-format
 msgid "Storage group %(name)s already exists. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:688
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:842
 #, python-format
 msgid ""
 "Storage group %(name)s doesn't exist, may have already been deleted. "
 "Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:720
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:874
 #, python-format
 msgid ""
 "Host %(host)s has already disconnected from storage group %(sgname)s. "
 "Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:740
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:894
 #, python-format
 msgid ""
 "LUN %(lun)s has already added to Storage Group %(sgname)s. Message: "
 "%(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:760
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:914
 #, python-format
 msgid "HLU %(hlu)s has already been removed from %(sgname)s. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:851
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1005
 #, python-format
 msgid "Invalid value for %(key)s, value is %(value)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:894
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1048
 #, python-format
 msgid "Error happened during storage pool querying, %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:915
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1069
 msgid "No array serial number returned, set as unknown."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1094
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1248
 #, python-format
 msgid "See unavailable iSCSI target: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1221
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1375
 #, python-format
 msgid "Toggle storage_vnx_ip_address from %(old)s to %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1300
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1454
 msgid ""
 "destroy_empty_storage_group: True. Empty storage group will be deleted "
 "after volume is detached."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1304
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1458
 msgid ""
 "initiator_auto_registration: False. Initiator auto registration is not "
 "enabled. Please register initiator manually."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1337
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1491
 #, python-format
 msgid ""
 "Create Volume: %(volume)s  Size: %(size)s pool: %(pool)s provisioning: "
 "%(provisioning)s tiering: %(tiering)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1385
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1539
 msgid "The given extra_spec or valid_values is None."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1387
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1541
 #, python-format
 msgid "The extra_spec: %s is invalid."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1413
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1567
 msgid "deduplicated and auto tiering can't be both enabled."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1417
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1571
 msgid "Compression Enabler is not installed. Can not create compressed volume."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1423
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1577
 msgid "Deduplication Enabler is not installed. Can not create deduplicated volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1429
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1583
 msgid "ThinProvisioning Enabler is not installed. Can not create thin volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1434
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1588
 msgid "FAST VP Enabler is not installed. Can't set tiering policy for the volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1463
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1617
 msgid ""
 "Failed to get target_pool_name and target_array_serial. 'location_info' "
 "is not in host['capabilities']."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1476
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1630
 msgid "Error on parsing target_pool_name/target_array_serial."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1594
-msgid "Storage-assisted migration failed during retype."
-msgstr ""
-
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1717
-#, python-format
-msgid "Delete Snapshot: %(snapshot)s"
-msgstr ""
-
 #: cinder/volume/drivers/emc/emc_vnx_cli.py:1748
-#, python-format
-msgid "Command to create the temporary Volume %s failed"
-msgstr ""
-
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1833
-#, python-format
-msgid "Storage Group %s is not found. Create it."
+msgid "Storage-assisted migration failed during retype."
 msgstr ""
 
 #: cinder/volume/drivers/emc/emc_vnx_cli.py:1875
 #, python-format
+msgid "Delete Snapshot: %(snapshot)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1909
+#, python-format
+msgid "Command to create the temporary Volume %s failed"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1968
+#, python-format
+msgid "Start to create consistency group: %(group_name)s id: %(id)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1977
+#, python-format
+msgid "Create consistency group %s failed."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1991
+#, python-format
+msgid "Start to delete consistency group: %(cg_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1997
+#, python-format
+msgid "Delete consistency group %s failed."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2019
+#, python-format
+msgid "Start to create cgsnapshot for consistency group: %(group_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2029
+#, python-format
+msgid "Create cg snapshot %s failed."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2046
+#, python-format
+msgid "Delete cgsnapshot %(snap_name)s for consistency group: %(group_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2056
+#, python-format
+msgid "Delete cgsnapshot %s failed."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2105
+#, python-format
+msgid "Storage Group %s is not found. Create it."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2147
+#, python-format
 msgid "Host %s has no iSCSI initiator"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1886
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2158
 #, python-format
 msgid "Host %s has no FC initiators"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1923
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2195
 #, python-format
 msgid "Get ISCSI targets %(tg)s to register initiator %(in)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1948
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2220
 #, python-format
 msgid "Get FC targets %(tg)s to register initiator %(in)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2039
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2311
 #, python-format
 msgid ""
 "Reach limitation set by configuration option max_luns_per_storage_group. "
 "Operation to add %(vol)s into Storage Group %(sg)s is rejected."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2063
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2335
 #, python-format
 msgid "Failed to add %(vol)s into %(sg)s after %(retries)s tries."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2099
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2371
 #, python-format
 msgid "Failed to find an available iSCSI targets for %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2163
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2435
 #, python-format
 msgid "Storage Group %s is not found. terminate_connection() is unnecessary."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2171
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2443
 #, python-format
 msgid "Volume %s is not found. It has probably been removed in VNX."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2179
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2451
 #, python-format
 msgid "Volume %(vol)s was not in Storage Group %(sg)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2187
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2459
 #, python-format
 msgid "Storage Group %s was empty, destroy it."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2197
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2469
 #, python-format
 msgid "Failed to destroy Storage Group %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2223
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2495
 msgid "Reference must contain lun_id element."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2231
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2503
 msgid "Find no lun with the specified lun_id."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2292
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2564
 #, python-format
 msgid "Storage pool %s is not supported by this Cinder Volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2316
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2588
 msgid "Error parsing output for FastCache Command."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2356
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2628
 msgid "The input lun is not in a manageable pool backend by cinder"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2384
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2656
 #, python-format
 msgid "Failed to find storage pool for source volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2396
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2668
 #, python-format
 msgid "Failed to find storage pool to create volume %s."
 msgstr ""
@@ -7378,9 +7566,9 @@ msgstr ""
 #: cinder/volume/drivers/fusionio/ioControl.py:284
 #: cinder/volume/drivers/ibm/ibmnas.py:110
 #: cinder/volume/drivers/ibm/storwize_svc/__init__.py:260
-#: cinder/volume/drivers/netapp/iscsi.py:123
-#: cinder/volume/drivers/netapp/nfs.py:670
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/volume/drivers/netapp/iscsi.py:127
+#: cinder/volume/drivers/netapp/nfs.py:678
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:202
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -7499,7 +7687,7 @@ msgstr ""
 msgid "Array mismatch %(myid)s vs %(arid)s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/nfs.py:216 cinder/volume/drivers/netapp/nfs.py:486
+#: cinder/volume/drivers/hds/nfs.py:216 cinder/volume/drivers/netapp/nfs.py:494
 #, python-format
 msgid "Resizing file to %sG"
 msgstr ""
@@ -7509,7 +7697,7 @@ msgstr ""
 msgid "LUN %(id)s extended to %(size)s GB."
 msgstr ""
 
-#: cinder/volume/drivers/hds/nfs.py:224 cinder/volume/drivers/netapp/nfs.py:492
+#: cinder/volume/drivers/hds/nfs.py:224 cinder/volume/drivers/netapp/nfs.py:500
 msgid "Resizing image file failed."
 msgstr ""
 
@@ -7998,7 +8186,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1225
-#: cinder/volume/targets/lio.py:116 cinder/volume/targets/lio.py:142
 #, python-format
 msgid "%s"
 msgstr ""
@@ -8368,11 +8555,6 @@ msgstr ""
 msgid "Failed in _delete_snapfiles. Error: %s"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/ibmnas.py:287
-#, python-format
-msgid "Volume %s does not have provider_location specified, skipping."
-msgstr ""
-
 #: cinder/volume/drivers/ibm/storwize_svc/__init__.py:181
 #, python-format
 msgid "Failed getting details for pool %s"
@@ -8512,49 +8694,49 @@ msgid ""
 "vdisk copy operation: orig=%(orig)s new=%(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:766
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:769
 #, python-format
 msgid "Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:778
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:781
 #, python-format
 msgid ""
 "_check_volume_copy_ops: Volume %(vol)s does not have the specified vdisk "
 "copy operation: orig=%(orig)s new=%(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:894
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:897
 #, python-format
 msgid "Unable to retype: Volume %s is replicated."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:910
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:913
 #, python-format
 msgid ""
 "Unable to retype:  A copy of volume %s exists. Retyping would exceed the "
 "limit of 2 copies."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:945
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:972
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:948
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:975
 #, python-format
 msgid "No vdisk with the UID specified by source-id %s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:965
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:968
 msgid "Reference must contain source-id element."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:981
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:984
 msgid "The specified vdisk is mapped to a host."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1021
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1024
 msgid "Could not get pool data from the storage"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1022
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1025
 msgid "_update_volume_stats: Could not get storage pool data"
 msgstr ""
 
@@ -8844,333 +9026,322 @@ msgid ""
 "resolve the issue '%s'."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:70
+#: cinder/volume/drivers/netapp/iscsi.py:74
 #, python-format
 msgid "No metadata property %(prop)s defined for the LUN %(name)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:176
+#: cinder/volume/drivers/netapp/iscsi.py:177
+#: cinder/volume/drivers/netapp/nfs.py:808
+#: cinder/volume/drivers/netapp/nfs.py:1378
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:312
+msgid "Pool is not available in the volume host field."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:209
 #, python-format
 msgid "No entry in LUN table for volume/snapshot %(name)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:228
+#: cinder/volume/drivers/netapp/iscsi.py:261
 #, python-format
 msgid "Mapped LUN %(name)s to the initiator %(initiator_name)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:233
+#: cinder/volume/drivers/netapp/iscsi.py:266
 #, python-format
 msgid ""
 "Successfully fetched target details for LUN %(name)s and initiator "
 "%(initiator_name)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:239
-#, python-format
-msgid "Failed to get LUN target details for the LUN %s"
-msgstr ""
-
-#: cinder/volume/drivers/netapp/iscsi.py:250
+#: cinder/volume/drivers/netapp/iscsi.py:283
 #, python-format
 msgid "Failed to get target portal for the LUN %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:253
+#: cinder/volume/drivers/netapp/iscsi.py:286
 #, python-format
 msgid "Failed to get target IQN for the LUN %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:311
-#: cinder/volume/drivers/netapp/iscsi.py:558
-#: cinder/volume/drivers/netapp/nfs.py:102
-#: cinder/volume/drivers/netapp/nfs.py:209
+#: cinder/volume/drivers/netapp/iscsi.py:344
+#: cinder/volume/drivers/netapp/iscsi.py:598
+#: cinder/volume/drivers/netapp/nfs.py:111
+#: cinder/volume/drivers/netapp/nfs.py:218
 #, python-format
 msgid "Resizing %s failed. Cleaning volume."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:326
+#: cinder/volume/drivers/netapp/iscsi.py:359
 #, python-format
 msgid "Unmapped LUN %(name)s from the initiator %(initiator_name)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:415
+#: cinder/volume/drivers/netapp/iscsi.py:389
+#, python-format
+msgid "Error provisioning volume %(lun_name)s on %(volume_name)s. Details: %(ex)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:455
 #, python-format
 msgid "Error mapping lun. Code :%(code)s, Message:%(message)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:434
+#: cinder/volume/drivers/netapp/iscsi.py:474
 #, python-format
 msgid "Error unmapping lun. Code :%(code)s, Message:%(message)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:504
+#: cinder/volume/drivers/netapp/iscsi.py:544
 msgid "Object is not a NetApp LUN."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:536
+#: cinder/volume/drivers/netapp/iscsi.py:576
 #, python-format
 msgid "Message: %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:538
+#: cinder/volume/drivers/netapp/iscsi.py:578
 #, python-format
 msgid "Error getting lun attribute. Exception: %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:594
+#: cinder/volume/drivers/netapp/iscsi.py:635
 #, python-format
 msgid "No need to extend volume %s as it is already the requested new size."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:600
+#: cinder/volume/drivers/netapp/iscsi.py:641
 #, python-format
 msgid "Resizing lun %s directly to new size."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:627
+#: cinder/volume/drivers/netapp/iscsi.py:668
 #, python-format
 msgid "Lun %(path)s geometry failed. Message - %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:671
+#: cinder/volume/drivers/netapp/iscsi.py:712
 #, python-format
 msgid "Resizing lun %s using sub clone to new size."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:678
+#: cinder/volume/drivers/netapp/iscsi.py:719
 #, python-format
 msgid "%s cannot be sub clone resized as it is hosted on compressed volume"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:684
+#: cinder/volume/drivers/netapp/iscsi.py:725
 #, python-format
 msgid "%s cannot be sub clone resized as it contains no blocks."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:701
+#: cinder/volume/drivers/netapp/iscsi.py:742
 #, python-format
 msgid "Post clone resize lun %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:712
+#: cinder/volume/drivers/netapp/iscsi.py:753
 #, python-format
 msgid "Failure staging lun %s to tmp."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:717
+#: cinder/volume/drivers/netapp/iscsi.py:758
 #, python-format
 msgid "Failure moving new cloned lun to %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:721
+#: cinder/volume/drivers/netapp/iscsi.py:762
 #, python-format
 msgid "Failure deleting staged tmp lun %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:724
+#: cinder/volume/drivers/netapp/iscsi.py:765
 #, python-format
 msgid "Unknown exception in post clone resize lun %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:726
+#: cinder/volume/drivers/netapp/iscsi.py:767
 #, python-format
 msgid "Exception details: %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:735
+#: cinder/volume/drivers/netapp/iscsi.py:776
 #, python-format
 msgid "Failure getting lun info for %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:782
-#, python-format
-msgid "Failed to get vol with required size and extra specs for volume: %s"
-msgstr ""
-
-#: cinder/volume/drivers/netapp/iscsi.py:794
-#, python-format
-msgid "Error provisioning vol %(name)s on %(volume)s. Details: %(ex)s"
-msgstr ""
-
-#: cinder/volume/drivers/netapp/iscsi.py:1013
+#: cinder/volume/drivers/netapp/iscsi.py:1022
 #, python-format
 msgid "No cloned lun named %s found on the filer"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1114
-msgid "Cluster ssc is not updated. No volume stats found."
-msgstr ""
-
-#: cinder/volume/drivers/netapp/iscsi.py:1176
-#: cinder/volume/drivers/netapp/nfs.py:1301
+#: cinder/volume/drivers/netapp/iscsi.py:1193
+#: cinder/volume/drivers/netapp/nfs.py:1341
 msgid "Unsupported ONTAP version. ONTAP version 7.3.1 and above is supported."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1180
-#: cinder/volume/drivers/netapp/nfs.py:1305
-#: cinder/volume/drivers/netapp/utils.py:325
+#: cinder/volume/drivers/netapp/iscsi.py:1197
+#: cinder/volume/drivers/netapp/nfs.py:1345
+#: cinder/volume/drivers/netapp/utils.py:328
 msgid "Api version could not be determined."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1191
+#: cinder/volume/drivers/netapp/iscsi.py:1228
 #, python-format
-msgid "Failed to get vol with required size for volume: %s"
+msgid "Could not determine root volume name on %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1300
+#: cinder/volume/drivers/netapp/iscsi.py:1307
 #, python-format
 msgid "Error finding luns for volume %s. Verify volume exists."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1510
+#: cinder/volume/drivers/netapp/iscsi.py:1568
 msgid "Volume refresh job already running. Returning..."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1516
+#: cinder/volume/drivers/netapp/iscsi.py:1574
 #, python-format
-msgid "Error refreshing vol capacity. Message: %s"
+msgid "Error refreshing volume info. Message: %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1524
-#, python-format
-msgid "Refreshing capacity info for %s."
-msgstr ""
-
-#: cinder/volume/drivers/netapp/nfs.py:107
-#: cinder/volume/drivers/netapp/nfs.py:214
+#: cinder/volume/drivers/netapp/nfs.py:116
+#: cinder/volume/drivers/netapp/nfs.py:223
 #, python-format
 msgid "NFS file %s not discovered."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:227
+#: cinder/volume/drivers/netapp/nfs.py:235
 #, python-format
 msgid "Copied image to volume %s using regular download."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:234
+#: cinder/volume/drivers/netapp/nfs.py:242
 #, python-format
 msgid "Registering image in cache %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:241
+#: cinder/volume/drivers/netapp/nfs.py:249
 #, python-format
 msgid ""
 "Exception while registering image %(image_id)s in cache. Exception: "
 "%(exc)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:267
+#: cinder/volume/drivers/netapp/nfs.py:275
 #, python-format
 msgid "Cloning from cache to destination %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:297
+#: cinder/volume/drivers/netapp/nfs.py:305
 #, python-format
 msgid "Cleaning cache for share %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:309
+#: cinder/volume/drivers/netapp/nfs.py:317
 #, python-format
 msgid "Exception during cache cleaning %(share)s. Message - %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:367
+#: cinder/volume/drivers/netapp/nfs.py:375
 #, python-format
 msgid "Exception during deleting %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:399
+#: cinder/volume/drivers/netapp/nfs.py:407
 #, python-format
 msgid "Image cloning unsuccessful for image %(image_id)s. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:415
+#: cinder/volume/drivers/netapp/nfs.py:423
 #, python-format
 msgid "Cloning image %s from cache"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:429
+#: cinder/volume/drivers/netapp/nfs.py:437
 #, python-format
 msgid "Unexpected exception during image cloning in share %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:435
+#: cinder/volume/drivers/netapp/nfs.py:443
 #, python-format
 msgid "Checking image clone %s from glance share."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:454
+#: cinder/volume/drivers/netapp/nfs.py:462
 #, python-format
 msgid "Image will locally be converted to raw %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:461
+#: cinder/volume/drivers/netapp/nfs.py:469
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:471
+#: cinder/volume/drivers/netapp/nfs.py:479
 #, python-format
 msgid "Performing post clone for %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:478
+#: cinder/volume/drivers/netapp/nfs.py:486
 msgid "NFS file could not be discovered."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:514
+#: cinder/volume/drivers/netapp/nfs.py:522
 msgid "Discover file retries exhausted."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:572
+#: cinder/volume/drivers/netapp/nfs.py:580
 msgid "Unexpected exception while short listing used share."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:587
+#: cinder/volume/drivers/netapp/nfs.py:595
 msgid "Image location not present."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:624
-msgid "Container size smaller than required file size."
-msgstr ""
-
 #: cinder/volume/drivers/netapp/nfs.py:632
-#, python-format
-msgid "Destination %s already exists."
+msgid "Container size smaller than required file size."
 msgstr ""
 
 #: cinder/volume/drivers/netapp/nfs.py:640
 #, python-format
+msgid "Destination %s already exists."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:648
+#, python-format
 msgid "Exception moving file %(src)s. Message - %(e)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:742
+#: cinder/volume/drivers/netapp/nfs.py:767
 #, python-format
 msgid "Shares on vserver %s will only be used for provisioning."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:746
-#: cinder/volume/drivers/netapp/nfs.py:948
+#: cinder/volume/drivers/netapp/nfs.py:771
 msgid "No vserver set in config. SSC will be disabled."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:795
+#: cinder/volume/drivers/netapp/nfs.py:824
+#: cinder/volume/drivers/netapp/nfs.py:1388
 #, python-format
 msgid "Exception creating vol %(name)s on share %(share)s. Details: %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:804
+#: cinder/volume/drivers/netapp/nfs.py:834
+#: cinder/volume/drivers/netapp/nfs.py:1393
 #, python-format
 msgid "Volume %s could not be created on shares."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:867
+#: cinder/volume/drivers/netapp/nfs.py:880
 #, python-format
 msgid "No interface found on cluster for ip %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:908
+#: cinder/volume/drivers/netapp/nfs.py:921
 #, python-format
 msgid ""
 "No volume on cluster with vserver\n"
@@ -9179,118 +9350,119 @@ msgid ""
 "                                   "
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:915
+#: cinder/volume/drivers/netapp/nfs.py:928
 #, python-format
 msgid ""
 "Cloning with params volume %(volume)s, src %(src_path)s,\n"
 "                    dest %(dest_path)s, vserver %(vserver)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:980
-msgid "No cluster ssc stats found. Wait for next volume stats update."
-msgstr ""
-
-#: cinder/volume/drivers/netapp/nfs.py:997
+#: cinder/volume/drivers/netapp/nfs.py:1037
 msgid "No shares found hence skipping ssc refresh."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1127
+#: cinder/volume/drivers/netapp/nfs.py:1167
 #, python-format
 msgid "Copied image %(img)s to volume %(vol)s using copy offload workflow."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1134
+#: cinder/volume/drivers/netapp/nfs.py:1174
 #, python-format
 msgid "Copy offload workflow unsuccessful. %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1158
+#: cinder/volume/drivers/netapp/nfs.py:1198
 #, python-format
 msgid "No vserver owning the ip %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1194
+#: cinder/volume/drivers/netapp/nfs.py:1234
 #, python-format
 msgid "Error in workflow copy from cache. %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1214
+#: cinder/volume/drivers/netapp/nfs.py:1254
 msgid "Source host details not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1264
+#: cinder/volume/drivers/netapp/nfs.py:1304
 #, python-format
 msgid "Converted to raw, but format is now %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1350
+#: cinder/volume/drivers/netapp/nfs.py:1382
+#, python-format
+msgid "Creating volume at location %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:1423
 #, python-format
 msgid "No storage path found for export path %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:422
+#: cinder/volume/drivers/netapp/ssc_utils.py:424
 #, python-format
 msgid "Running stale ssc refresh job for %(server)s and vserver %(vs)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:456
+#: cinder/volume/drivers/netapp/ssc_utils.py:458
 #, python-format
 msgid "Successfully completed stale refresh job for %(server)s and vserver %(vs)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:483
+#: cinder/volume/drivers/netapp/ssc_utils.py:485
 #, python-format
 msgid "Running cluster latest ssc job for %(server)s and vserver %(vs)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:489
+#: cinder/volume/drivers/netapp/ssc_utils.py:491
 #, python-format
 msgid "Successfully completed ssc job for %(server)s and vserver %(vs)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:501
+#: cinder/volume/drivers/netapp/ssc_utils.py:503
 msgid "Backend not a VolumeDriver."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:503
+#: cinder/volume/drivers/netapp/ssc_utils.py:505
 msgid "Backend server not NaServer."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:506
+#: cinder/volume/drivers/netapp/ssc_utils.py:508
 msgid "ssc job in progress. Returning... "
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:518
+#: cinder/volume/drivers/netapp/ssc_utils.py:520
 msgid "refresh stale ssc job in progress. Returning... "
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:614
+#: cinder/volume/drivers/netapp/ssc_utils.py:616
 msgid "Fatal error: User not permitted to query NetApp volumes."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:621
+#: cinder/volume/drivers/netapp/ssc_utils.py:623
 #, python-format
 msgid ""
 "The user does not have access or sufficient privileges to use all netapp "
 "apis. The following extra_specs will fail or be ignored: %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:128
+#: cinder/volume/drivers/netapp/utils.py:131
 #, python-format
 msgid "Failed to invoke ems. Message : %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:141
+#: cinder/volume/drivers/netapp/utils.py:144
 msgid ""
 "It is not the recommended way to use drivers by NetApp. Please use "
 "NetAppDriver to achieve the functionality."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:164
+#: cinder/volume/drivers/netapp/utils.py:167
 msgid "Requires an NaServer instance."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:322
+#: cinder/volume/drivers/netapp/utils.py:325
 msgid "Unsupported Clustered Data ONTAP version."
 msgstr ""
 
@@ -9329,196 +9501,203 @@ msgstr ""
 msgid "Response error code - %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:102
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:104
 #, python-format
 msgid "Error resolving host %(host)s. Error - %(e)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:112
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:114
 msgid "Controller ips not valid after resolution."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:115
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:117
 msgid "Embedded mode detected."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:118
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:120
 msgid "Proxy mode detected."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:129
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:131
 #, python-format
 msgid "System with controller addresses [%s] is not registered with web service."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:147
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:149
 msgid "Waiting for web service array communication."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:151
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:153
 #, python-format
 msgid ""
 "Failure in communication between web service and array. Waited %s "
 "seconds. Verify array configuration parameters."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:161
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:163
 #, python-format
 msgid "System %(id)s found with bad status - %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:163
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:165
 #, python-format
 msgid "System %(id)s has %(status)s status."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:179
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:181
 #, python-format
 msgid "Configured storage pools %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:275
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:278
 #, python-format
 msgid "No pit image found in snapshot group %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:301
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:335
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:336
+#, python-format
+msgid "Pools %s does not exist"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:342
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:357
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:374
 #, python-format
 msgid "Created volume with label %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:304
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:345
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:360
 #, python-format
 msgid "Error creating volume. Msg - %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:305
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:361
 #, python-format
 msgid "Failure creating volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:321
-#, python-format
-msgid "No storage pool found with available capacity %s."
-msgstr ""
-
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:344
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:383
 #, python-format
 msgid "Failure deleting snap vol. Error: %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:346
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:385
 msgid "Snapshot volume not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:362
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:401
 #, python-format
 msgid "Copying src vol %(src)s to dest vol %(dst)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:375
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:414
 #, python-format
 msgid "Vol copy job status %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:376
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:415
 #, python-format
 msgid "Vol copy job for dest %s failed."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:379
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:418
 #, python-format
 msgid "Vol copy job completed for dest %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:387
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:426
 #, python-format
 msgid "Failure deleting job %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:389
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:428
 #, python-format
 msgid "Volume copy job for src vol %s not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:391
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:430
 #, python-format
 msgid "Copy job to dest vol %s completed."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:403
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:442
 #, python-format
 msgid "Failure deleting temp snapshot %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:412
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:451
 #, python-format
 msgid "Volume %s already deleted."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:436
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:475
 #, python-format
 msgid "Created snap grp with label %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:447
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:486
 #, python-format
 msgid "Snapshot %s already deleted."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:473
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:512
 #, python-format
 msgid "Mapped volume %(id)s to the initiator %(initiator_name)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:476
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:515
 #, python-format
 msgid ""
 "Successfully fetched target details for volume %(id)s and initiator "
 "%(initiator_name)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:516
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:555
 #, python-format
 msgid "No good iscsi portal information found for %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:541
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:580
 #, python-format
 msgid "Message - %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:556
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:595
 #, python-format
 msgid "Host with port %(port)s and type %(type)s not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:561
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:600
 #, python-format
 msgid "Creating host with port %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:574
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:613
 #, python-format
 msgid "Host type %s not supported."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:584
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:623
 msgid "No free luns. Host might exceeded max luns."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:614
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:653
 #, python-format
 msgid "Mapping not found for %(vol)s to host %(ht)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:668
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:705
+#, python-format
+msgid "No storage pool found with available capacity %s."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:724
 #, python-format
 msgid "Extended volume with label %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:682
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:738
 msgid "Returning as clean tmp vol job already running."
 msgstr ""
 
@@ -10057,285 +10236,278 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:206
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:211
 #, python-format
 msgid ""
 "Invalid hp3parclient version found (%(found)s). Version %(minimum)s or "
 "greater required."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:228
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:247
 #, python-format
 msgid "Failed to Login to 3PAR (%(url)s) because %(err)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:239
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:258
 msgid "You must install hp3parclient before using 3PAR drivers."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:245
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:264
 #, python-format
 msgid "HP3PARCommon %(common_ver)s, hp3parclient %(rest_ver)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:282
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:643
 #, python-format
 msgid "CPG (%s) doesn't exist on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:271
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:290
 #, python-format
 msgid "Failed to get domain because CPG (%s) doesn't exist on array."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:304
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:400
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:323
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:419
 #, python-format
 msgid "Virtual volume '%s' doesn't exist on array."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:337
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:356
 #, python-format
 msgid "Volume type ID '%s' is invalid."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:346
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:365
 #, python-format
 msgid "Virtual volume '%(ref)s' renamed to '%(new)s'."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:369
 #, python-format
 msgid "Virtual volume %(disp)s '%(new)s' is being retyped."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:355
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:374
 #, python-format
 msgid "Virtual volume %(disp)s successfully retyped to %(new_type)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:361
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:380
 #, python-format
 msgid "Failed to manage virtual volume %(disp)s due to error during retype."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:370
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:389
 #, python-format
 msgid "Virtual volume %(disp)s '%(new)s' is now being managed."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:391
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:410
 msgid "Reference must be for an unmanaged virtual volume."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:415
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:434
 #, python-format
 msgid ""
 "Virtual volume %(disp)s '%(vol)s' is no longer managed. Volume renamed to"
 " '%(new)s'."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:444
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:463
 #, python-format
 msgid "Error extending volume: %(vol)s. Exception: %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:649
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:669
 #, python-format
 msgid "3PAR vlun %(name)s not found on host %(host)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:672
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:692
 #, python-format
 msgid "3PAR vlun for volume %(name)s not found on host %(host)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:711
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:731
 #, python-format
 msgid ""
 "3PAR vlun for volume '%(name)s' was deleted, but the host '%(host)s' was "
 "not deleted because: %(reason)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:811
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:831
 #, python-format
 msgid "Error creating QOS rule %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:820
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:840
 #, python-format
 msgid "VV Set %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:862
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:882
 #, python-format
 msgid "Must specify a valid persona %(valid)s,value '%(persona)s' is invalid."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:941
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:961
 #, python-format
 msgid ""
 "Must specify a valid provisioning type %(valid)s, value '%(prov)s' is "
 "invalid."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1027
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1047
 #, python-format
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1138
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1158
 msgid ""
 "The volume is currently busy on the 3PAR and cannot be deleted at this "
 "time. You can try again later."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1150
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1170
 #, python-format
 msgid "Delete volume id not found. Removing from cinder: %(id)s Ex: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1214
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1234
 #, python-format
 msgid "Error extending volume %(id)s. Ex: %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1298
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1318
 #, python-format
 msgid "Failure in update_volume_key_value_pair:%s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1312
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1332
 #, python-format
 msgid "Failure in clear_volume_key_value_pair:%s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1324
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1344
 #, python-format
 msgid "Error attaching volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1332
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1352
 #, python-format
 msgid "Error detaching volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1432
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1452
 #, python-format
 msgid ""
 "Copy volume task failed: convert_to_base_volume: id=%(id)s, "
 "status=%(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1453
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1473
 #, python-format
 msgid "Completed: convert_to_base_volume: id=%s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1456
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1476
 #, python-format
 msgid "Volume (%s) already exists on array."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1485
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1505
 #, python-format
 msgid "Delete Snapshot id not found. Removing from cinder: %(id)s Ex: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1565
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1585
 #, python-format
 msgid "Modifying %(volume_name)s userCPG from %(old_cpg)s to %(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1577
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1613
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1597
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1633
 #, python-format
 msgid ""
 "Tune volume task stopped before it was done: volume_name=%(volume_name)s,"
 " task-status=%(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1585
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1605
 #, python-format
 msgid "Converting %(volume_name)s to full provisioning with userCPG=%(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1590
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1610
 #, python-format
 msgid "Converting %(volume_name)s to thin provisioning with userCPG=%(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1606
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1626
 #, python-format
 msgid "tunevv failed because the volume '%s' has snapshots."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1636
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1656
 #, python-format
 msgid "Cannot retype from HP3PARDriver to %s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1642
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1662
 msgid "Cannot retype from one 3PAR array to another."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1646
-#, python-format
-msgid ""
-"Invalid current snapCPG name for retype.  The volume may be in a "
-"transitioning state.  snapCpg='%s'."
-msgstr ""
-
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1654
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1668
 #, python-format
 msgid "Invalid new snapCPG name for retype.  new_snap_cpg='%s'."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1660
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1675
 msgid "Cannot retype to a CPG in a different domain."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1664
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1679
 msgid "Cannot retype to a snap CPG in a different domain."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1866
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1881
 #, python-format
 msgid ""
 "Modifying %(volume_name)s snap_cpg from %(old_snap_cpg)s to "
 "%(new_snap_cpg)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1877
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1892
 #, python-format
 msgid "Modifying %s comments."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1886
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1901
 #, python-format
 msgid ""
 "Retype revert %(volume_name)s snap_cpg from %(new_snap_cpg)s back to "
 "%(old_snap_cpg)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1896
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1911
 #, python-format
 msgid "Exception during snapCPG revert: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1965
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1980
 #, python-format
 msgid "Unexpected error when retype() tried to deleteVolumeSet(%s)"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1987
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1991
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2002
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2006
 #, python-format
 msgid "Unexpected error when retype() revert tried to deleteVolumeSet(%s)"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:2000
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2015
 #, python-format
 msgid ""
 "%(exception)s: Exception during revert of retype for volume "
@@ -10343,60 +10515,60 @@ msgid ""
 " restored."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:2012
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2027
 #, python-format
 msgid ""
 "%(exception)s: Exception during revert of retype for volume "
 "%(volume_name)s. Failed to remove from new volume set %(new_vvs)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_fc.py:258
 msgid "Need to remove FC Zone, building initiator target map"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:139
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:140
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:173
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:174
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:179
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:180
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:280
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:281
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:417
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:418
 msgid ""
 "Host exists without CHAP credentials set and has iSCSI attachments but "
 "CHAP is enabled.  Updating host with new CHAP credentials."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:444
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:445
 msgid "Host has no CHAP key, but CHAP is enabled."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:448
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:449
 msgid "No host or VLUNs exist. Generating new CHAP key."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:476
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:477
 msgid "Non-iSCSI VLUN detected."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:480
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:481
 msgid "No VLUN contained CHAP credentials. Generating new CHAP key."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:514
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:515
 #, python-format
 msgid "Volume %s doesn't exist on array."
 msgstr ""
@@ -10603,32 +10775,36 @@ msgstr ""
 msgid "Error occurred during image transfer."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/io_util.py:129
+#: cinder/volume/drivers/vmware/error_util.py:90
+msgid "There is no virtual disk device."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/io_util.py:130
 #, python-format
 msgid "Glance image: %s is in killed state."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/io_util.py:138
+#: cinder/volume/drivers/vmware/io_util.py:139
 #, python-format
 msgid "Glance image %(id)s is in unknown state - %(state)s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/io_util.py:146
+#: cinder/volume/drivers/vmware/io_util.py:147
 #, python-format
 msgid "Error occurred while writing to image: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/read_write_util.py:205
-#: cinder/volume/drivers/vmware/read_write_util.py:294
+#: cinder/volume/drivers/vmware/read_write_util.py:206
+#: cinder/volume/drivers/vmware/read_write_util.py:299
 msgid "Could not retrieve URL from lease."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/read_write_util.py:208
+#: cinder/volume/drivers/vmware/read_write_util.py:209
 #, python-format
 msgid "Opening vmdk url: %s for write."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/read_write_util.py:297
+#: cinder/volume/drivers/vmware/read_write_util.py:302
 #, python-format
 msgid "Opening vmdk url: %s for read."
 msgstr ""
@@ -10668,330 +10844,345 @@ msgstr ""
 msgid "Error in %(attr)s. Detailed error: %(excep)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:174
+#: cinder/volume/drivers/vmware/vmdk.py:181
 #, python-format
 msgid "Invalid disk type: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:187
+#: cinder/volume/drivers/vmware/vmdk.py:195
 msgid ""
 "The VMware ESX VMDK driver is now deprecated and will be removed in the "
 "Juno release. The VMware vCenter VMDK driver will remain and continue to "
 "be supported."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:239
+#: cinder/volume/drivers/vmware/vmdk.py:247
 #, python-format
 msgid "%s not set."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:247
-#: cinder/volume/drivers/vmware/vmdk.py:1479
+#: cinder/volume/drivers/vmware/vmdk.py:255
+#: cinder/volume/drivers/vmware/vmdk.py:1711
 #, python-format
 msgid "Successfully setup driver: %(driver)s for server: %(ip)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:289
+#: cinder/volume/drivers/vmware/vmdk.py:297
 #, python-format
 msgid "Not able to find a suitable datastore for the volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:312
+#: cinder/volume/drivers/vmware/vmdk.py:320
 msgid "Backing not available, no operation to be performed."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:380
+#: cinder/volume/drivers/vmware/vmdk.py:388
 #, python-format
 msgid ""
 "Unable to pick datastore to accommodate %(size)s bytes from the "
 "datastores: %(dss)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:416
+#: cinder/volume/drivers/vmware/vmdk.py:424
 #, python-format
 msgid "No such storage profile '%s; is defined in vCenter."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:443
+#: cinder/volume/drivers/vmware/vmdk.py:451
 #, python-format
 msgid "Aborting since none of the datastores match the given storage profile %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:448
+#: cinder/volume/drivers/vmware/vmdk.py:456
 #, python-format
 msgid ""
 "Ignoring storage profile %s requirement for this volume since policy "
 "based placement is disabled."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:555
+#: cinder/volume/drivers/vmware/vmdk.py:563
 #, python-format
 msgid ""
 "Unable to find suitable datastore for volume of size: %(vol)s GB under "
 "host: %(host)s. More details: %(excep)s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:565
+#: cinder/volume/drivers/vmware/vmdk.py:573
 #, python-format
 msgid "Unable to find host to accommodate a disk of size: %s in the inventory."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:596
+#: cinder/volume/drivers/vmware/vmdk.py:604
 #, python-format
 msgid ""
 "Unable to find suitable datastore for volume: %(vol)s under host: "
 "%(host)s. More details: %(excep)s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:606
+#: cinder/volume/drivers/vmware/vmdk.py:614
 #, python-format
 msgid "Unable to create volume: %s in the inventory."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:632
+#: cinder/volume/drivers/vmware/vmdk.py:640
 #, python-format
 msgid "There is no backing for the volume: %s. Need to create one."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:645
+#: cinder/volume/drivers/vmware/vmdk.py:653
 #, python-format
 msgid "Trying to boot from an empty volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:654
+#: cinder/volume/drivers/vmware/vmdk.py:662
 #, python-format
 msgid ""
 "Returning connection_info: %(info)s for volume: %(volume)s with "
 "connector: %(connector)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:702
+#: cinder/volume/drivers/vmware/vmdk.py:710
 #, python-format
 msgid "Snapshot of volume not supported in state: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:707
+#: cinder/volume/drivers/vmware/vmdk.py:715
 #, python-format
 msgid "There is no backing, so will not create snapshot: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:712
+#: cinder/volume/drivers/vmware/vmdk.py:720
 #, python-format
 msgid "Successfully created snapshot: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:733
+#: cinder/volume/drivers/vmware/vmdk.py:741
 #, python-format
 msgid "Delete snapshot of volume not supported in state: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:738
+#: cinder/volume/drivers/vmware/vmdk.py:746
 #, python-format
 msgid "There is no backing, and so there is no snapshot: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:742
+#: cinder/volume/drivers/vmware/vmdk.py:750
 #, python-format
 msgid "Successfully deleted snapshot: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:783
+#: cinder/volume/drivers/vmware/vmdk.py:791
 #, python-format
 msgid "Successfully cloned new backing: %(back)s from source VMDK file: %(vmdk)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:800
+#: cinder/volume/drivers/vmware/vmdk.py:808
 #, python-format
 msgid ""
 "There is no backing for the source volume: %(svol)s. Not creating any "
 "backing for the volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:831
+#: cinder/volume/drivers/vmware/vmdk.py:839
 #, python-format
 msgid ""
 "There is no backing for the source snapshot: %(snap)s. Not creating any "
 "backing for the volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:840
-#: cinder/volume/drivers/vmware/vmdk.py:1595
+#: cinder/volume/drivers/vmware/vmdk.py:848
+#: cinder/volume/drivers/vmware/vmdk.py:1827
 #, python-format
 msgid ""
 "There is no snapshot point for the snapshotted volume: %(snap)s. Not "
 "creating any backing for the volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:875
+#: cinder/volume/drivers/vmware/vmdk.py:883
 #, python-format
 msgid "Cannot create image of disk format: %s. Only vmdk disk format is accepted."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:914
+#: cinder/volume/drivers/vmware/vmdk.py:922
 #, python-format
 msgid "Error occurred while deleting temporary disk: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:928
+#: cinder/volume/drivers/vmware/vmdk.py:936
 #, python-format
 msgid "Error occurred while copying %(src)s to %(dst)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:990
+#: cinder/volume/drivers/vmware/vmdk.py:998
 #, python-format
 msgid "Error occurred while copying image: %(image_id)s to %(path)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1000
+#: cinder/volume/drivers/vmware/vmdk.py:1008
 #, python-format
 msgid "Error occurred while deleting descriptor: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1029
+#: cinder/volume/drivers/vmware/vmdk.py:1037
 #, python-format
 msgid "Error occurred while deleting backing: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1114
+#: cinder/volume/drivers/vmware/vmdk.py:1122
 #, python-format
 msgid "Error occured while creating volume: %(id)s from image: %(image_id)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1137
+#: cinder/volume/drivers/vmware/vmdk.py:1145
 #, python-format
 msgid "Exception in _select_ds_for_volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1181
+#: cinder/volume/drivers/vmware/vmdk.py:1189
 #, python-format
 msgid "Exception in copy_image_to_volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1185
+#: cinder/volume/drivers/vmware/vmdk.py:1193
 #, python-format
 msgid "Deleting the backing: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1189
+#: cinder/volume/drivers/vmware/vmdk.py:1197
 #, python-format
 msgid "Done copying image: %(id)s to volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1200
+#: cinder/volume/drivers/vmware/vmdk.py:1208
 #, python-format
 msgid ""
 "The backing is not found, so there is no need to extend the vmdk virtual "
 "disk for the volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1222
+#: cinder/volume/drivers/vmware/vmdk.py:1230
 #, python-format
 msgid "Unable to extend the size of the vmdk virtual disk at the path %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1272
+#: cinder/volume/drivers/vmware/vmdk.py:1280
 #, python-format
 msgid "Exception in copying the image to the volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1306
+#: cinder/volume/drivers/vmware/vmdk.py:1317
 msgid "Upload to glance of attached volume is not supported."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1317
+#: cinder/volume/drivers/vmware/vmdk.py:1328
 #, python-format
 msgid "Backing not found, creating for volume: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1336
+#: cinder/volume/drivers/vmware/vmdk.py:1347
 #, python-format
 msgid "Done copying volume %(vol)s to a new image %(img)s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1353
-#: cinder/volume/drivers/vmware/vmdk.py:1382
+#: cinder/volume/drivers/vmware/vmdk.py:1364
+#: cinder/volume/drivers/vmware/vmdk.py:1393
 #, python-format
 msgid "Done extending volume %(vol)s to size %(size)s GB."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1357
+#: cinder/volume/drivers/vmware/vmdk.py:1368
 #, python-format
 msgid ""
 "Relocating volume %s vmdk to a different datastore since trying to extend"
 " vmdk file in place failed."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1365
+#: cinder/volume/drivers/vmware/vmdk.py:1376
 #, python-format
 msgid "Not able to find a different datastore to place the extended volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1368
+#: cinder/volume/drivers/vmware/vmdk.py:1379
 #, python-format
 msgid "Selected datastore %(ds)s to place extended volume of size %(size)s GB."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1380
+#: cinder/volume/drivers/vmware/vmdk.py:1391
 #, python-format
 msgid "Not able to relocate volume %s for extending."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1429
+#: cinder/volume/drivers/vmware/vmdk.py:1492
+msgid "Error occurred while creating temporary backing."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:1557
+#, python-format
+msgid ""
+"Cannot undo volume rename; old name was %(old_name)s and new name is "
+"%(new_name)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:1580
+msgid "Volume cannot be restored since it contains snapshots."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:1661
 #, python-format
 msgid "PBM WSDL file %s is missing!"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1432
+#: cinder/volume/drivers/vmware/vmdk.py:1664
 #, python-format
 msgid "Using PBM WSDL location: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1443
+#: cinder/volume/drivers/vmware/vmdk.py:1675
 #, python-format
 msgid "Using overridden vmware_host_version from config: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1447
+#: cinder/volume/drivers/vmware/vmdk.py:1679
 #, python-format
 msgid "Fetched VC server version: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1454
+#: cinder/volume/drivers/vmware/vmdk.py:1686
 #, python-format
 msgid "Version string '%s' is not parseable"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1468
+#: cinder/volume/drivers/vmware/vmdk.py:1700
 #, python-format
 msgid "Not able to configure PBM for VC server: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1527
+#: cinder/volume/drivers/vmware/vmdk.py:1759
 #, python-format
 msgid "Relocating volume: %(backing)s to %(ds)s and %(rp)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1573
+#: cinder/volume/drivers/vmware/vmdk.py:1805
 #: cinder/volume/drivers/vmware/volumeops.py:1044
 #, python-format
 msgid "Successfully created clone: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1587
+#: cinder/volume/drivers/vmware/vmdk.py:1819
 #, python-format
 msgid ""
 "There is no backing for the snapshotted volume: %(snap)s. Not creating "
 "any backing for the volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1624
+#: cinder/volume/drivers/vmware/vmdk.py:1856
 #, python-format
 msgid ""
 "There is no backing for the source volume: %(src)s. Not creating any "
 "backing for volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1632
+#: cinder/volume/drivers/vmware/vmdk.py:1864
 #, python-format
 msgid "Linked clone of source volume not supported in state: %s."
 msgstr ""
@@ -11071,39 +11262,97 @@ msgstr ""
 msgid "Successfully deleted file: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1157
+#: cinder/volume/drivers/vmware/volumeops.py:1145
+#, python-format
+msgid "Virtual disk device of backing: %s not found."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:1160
 #, python-format
 msgid "Invalid disk backing: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1247
+#: cinder/volume/drivers/vmware/volumeops.py:1259
 #, python-format
 msgid "Successfully copied disk at: %(src)s to: %(dest)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1265
+#: cinder/volume/drivers/vmware/volumeops.py:1277
 #, python-format
 msgid "Deleted vmdk file: %s."
 msgstr ""
 
-#: cinder/volume/drivers/windows/vhdutils.py:132
+#: cinder/volume/drivers/windows/remotefs.py:52
+msgid "Link path already exists and its not a symlink"
+msgstr ""
+
+#: cinder/volume/drivers/windows/remotefs.py:80
+#, python-format
+msgid "Could not create symbolic link. Link: %(link)s Target %(target)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/remotefs.py:115
+#, python-format
+msgid "Mounting share: %s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/remotefs.py:118
+#, python-format
+msgid ""
+"Unable to mount SMBFS share: %(smbfs_share)s WMI exception: "
+"%(wmi_exc)sOptions: %(options)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/remotefs.py:137
+#, python-format
+msgid "Could not get share %s capacity info."
+msgstr ""
+
+#: cinder/volume/drivers/windows/smbfs.py:66
+#, python-format
+msgid ""
+"This system platform (%s) is not supported. This driver supports only "
+"Win32 platforms."
+msgstr ""
+
+#: cinder/volume/drivers/windows/smbfs.py:76
+#, python-format
+msgid "File already exists at: %s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/smbfs.py:81
+#, python-format
+msgid "Unsupported volume format: %s "
+msgstr ""
+
+#: cinder/volume/drivers/windows/vhdutils.py:220
 #, python-format
 msgid "Opening virtual disk failed with error: %s"
 msgstr ""
 
-#: cinder/volume/drivers/windows/vhdutils.py:143
+#: cinder/volume/drivers/windows/vhdutils.py:231
 #, python-format
 msgid "Unsupported virtual disk extension: %s"
 msgstr ""
 
-#: cinder/volume/drivers/windows/vhdutils.py:163
+#: cinder/volume/drivers/windows/vhdutils.py:249
 #, python-format
 msgid "Virtual disk resize failed with error: %s"
 msgstr ""
 
-#: cinder/volume/drivers/windows/vhdutils.py:206
+#: cinder/volume/drivers/windows/vhdutils.py:271
 #, python-format
-msgid "Virtual disk conversion failed with error: %s"
+msgid "Virtual disk merge failed with error: %s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/vhdutils.py:318
+#, python-format
+msgid "Virtual disk creation failed with error: %s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/vhdutils.py:423
+#, python-format
+msgid "Virtual disk reconnect failed with error: %s"
 msgstr ""
 
 #: cinder/volume/drivers/windows/windows_utils.py:56
@@ -11232,51 +11481,51 @@ msgstr ""
 msgid "ZFSSA version: %s"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/restclient.py:279
+#: cinder/volume/drivers/zfssa/restclient.py:282
 #, python-format
 msgid "REST Not Available: %s"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/restclient.py:284
+#: cinder/volume/drivers/zfssa/restclient.py:288
 #, python-format
 msgid "Server Busy retry request: %s"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/restclient.py:290
+#: cinder/volume/drivers/zfssa/restclient.py:294
 #, python-format
 msgid "Authorizing request: %(zfssaurl)sretry: %(retry)d ."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/restclient.py:307
+#: cinder/volume/drivers/zfssa/restclient.py:311
 #, python-format
 msgid "URLError: %s"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssaiscsi.py:95
+#: cinder/volume/drivers/zfssa/zfssaiscsi.py:98
 #, python-format
 msgid "Connecting to host: %s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssaiscsi.py:110
+#: cinder/volume/drivers/zfssa/zfssaiscsi.py:113
 #, python-format
 msgid ""
 "zfssa_initiator: %(ini)s wont be used on zfssa_initiator_group= "
 "%(inigrp)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssaiscsi.py:246
+#: cinder/volume/drivers/zfssa/zfssaiscsi.py:249
 #, python-format
 msgid "Snapshot %s: has clones"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssaiscsi.py:261
+#: cinder/volume/drivers/zfssa/zfssaiscsi.py:264
 #, python-format
 msgid ""
 "Error verifying clone size on Volume clone: %(clone)s Size: %(size)d "
 "onSnapshot: %(snapshot)s"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssaiscsi.py:359
+#: cinder/volume/drivers/zfssa/zfssaiscsi.py:362
 #, python-format
 msgid "Clone Volume:%(volume)s failed from source volume:%(src_vref)s"
 msgstr ""
diff --git a/cinder/locale/cs/LC_MESSAGES/cinder-log-error.po b/cinder/locale/cs/LC_MESSAGES/cinder-log-error.po
index a80f41e2837..14debba3429 100644
--- a/cinder/locale/cs/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/cs/LC_MESSAGES/cinder-log-error.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
 "PO-Revision-Date: 2014-08-07 07:52+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/cinder/language/"
@@ -30,6 +30,14 @@ msgstr ""
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr ""
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr ""
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -49,3 +57,11 @@ msgstr ""
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr ""
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr ""
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr ""
diff --git a/cinder/locale/de/LC_MESSAGES/cinder-log-error.po b/cinder/locale/de/LC_MESSAGES/cinder-log-error.po
index eaa08e7b1b5..58a9cf24cd1 100644
--- a/cinder/locale/de/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/de/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-09-01 20:31+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/cinder/language/"
 "de/)\n"
@@ -29,6 +29,14 @@ msgstr "Ursprüngliche Ausnahme wird gelöscht: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Unerwartete Ausnahme %d mal(e) aufgetreten... Neuversuch."
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "in Schleifenaufruf mit festgelegter Dauer"
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "in dynamischen Schleifenaufruf"
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr "Kein Handler für Übereinstimmungen des Typs %s"
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr "Regel %r konnte nicht verstanden werden"
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr "Ausnahme bei RPC Cleanup."
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "Nicht behandelte Ausnahme"
diff --git a/cinder/locale/de/LC_MESSAGES/cinder-log-info.po b/cinder/locale/de/LC_MESSAGES/cinder-log-info.po
index fc19d5cbe3b..741ca41717e 100644
--- a/cinder/locale/de/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/de/LC_MESSAGES/cinder-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/cinder/language/"
 "de/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr "Eventlet backdoor hört auf %(port)s für Prozess %(pid)d"
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -29,3 +34,56 @@ msgstr ""
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "Überspringe periodische Aufgabe %(task)s weil sie deaktiviert ist"
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "%s abgefangen. Vorgang wird beendet"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+"Übergeordneter Prozess wurde unerwartet abgebrochen. Vorgang wird beendet"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr "Untergeordnetes Element %s abgefangen; Vorgang wird beendet"
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "Verzweigung zu schnell; im Ruhemodus"
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "Untergeordnetes Element %d gestartet"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "Starten von %d Workers"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "Untergeordnetes Element %(pid)d durch Signal %(sig)d abgebrochen"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "Untergeordnete %(pid)s mit Status %(code)d beendet"
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "%s abgefangen, untergeordnete Elemente werden gestoppt"
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr "Warten aufgerufen nach dem der Thread abgebrochen wurde. Bereinige."
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "Warten auf Beenden von %d untergeordneten Elementen"
diff --git a/cinder/locale/en_AU/LC_MESSAGES/cinder-log-error.po b/cinder/locale/en_AU/LC_MESSAGES/cinder-log-error.po
index c8bb51db503..e3fc863b81f 100644
--- a/cinder/locale/en_AU/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/en_AU/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-09-01 20:31+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
 "cinder/language/en_AU/)\n"
@@ -29,6 +29,14 @@ msgstr "Original exception being dropped: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Unexpected exception occurred %d time(s)... retrying."
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "in fixed duration looping call"
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "in dynamic looping call"
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr "No handler for matches of kind %s"
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr "Failed to understand rule %r"
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr "Exception during rpc cleanup."
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "Unhandled exception"
diff --git a/cinder/locale/en_AU/LC_MESSAGES/cinder-log-info.po b/cinder/locale/en_AU/LC_MESSAGES/cinder-log-info.po
index e71fb965427..e0a3ec21bf5 100644
--- a/cinder/locale/en_AU/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/en_AU/LC_MESSAGES/cinder-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
 "cinder/language/en_AU/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr "Eventlet backdoor listening on %(port)s for process %(pid)d"
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -28,3 +33,55 @@ msgstr "Skipping periodic task %(task)s because its interval is negative"
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "Skipping periodic task %(task)s because it is disabled"
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "Caught %s, exiting"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "Parent process has died unexpectedly, exiting"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr ""
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "Forking too fast, sleeping"
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "Started child %d"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "Starting %d workers"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "Child %(pid)d killed by signal %(sig)d"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "Child %(pid)s exited with status %(code)d"
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "Caught %s, stopping children"
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr ""
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "Waiting on %d children to exit"
diff --git a/cinder/locale/en_GB/LC_MESSAGES/cinder-log-error.po b/cinder/locale/en_GB/LC_MESSAGES/cinder-log-error.po
index 2cea82debb4..9486dd288a9 100644
--- a/cinder/locale/en_GB/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/en_GB/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-09-01 20:31+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "cinder/language/en_GB/)\n"
@@ -29,6 +29,14 @@ msgstr "Original exception being dropped: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Unexpected exception occurred %d time(s)... retrying."
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "in fixed duration looping call"
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "in dynamic looping call"
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr "No handler for matches of kind %s"
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr "Failed to understand rule %r"
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr "Exception during rpc cleanup."
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "Unhandled exception"
diff --git a/cinder/locale/en_GB/LC_MESSAGES/cinder-log-info.po b/cinder/locale/en_GB/LC_MESSAGES/cinder-log-info.po
index f335523871d..16a26c84ca2 100644
--- a/cinder/locale/en_GB/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/en_GB/LC_MESSAGES/cinder-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "cinder/language/en_GB/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr "Eventlet backdoor listening on %(port)s for process %(pid)d"
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -28,3 +33,55 @@ msgstr "Skipping periodic task %(task)s because its interval is negative"
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "Skipping periodic task %(task)s because it is disabled"
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "Caught %s, exiting"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "Parent process has died unexpectedly, exiting"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr "Child caught %s, exiting"
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "Forking too fast, sleeping"
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "Started child %d"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "Starting %d workers"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "Child %(pid)d killed by signal %(sig)d"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "Child %(pid)s exited with status %(code)d"
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "Caught %s, stopping children"
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr "Wait called after thread killed.  Cleaning up."
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "Waiting on %d children to exit"
diff --git a/cinder/locale/en_GB/LC_MESSAGES/cinder-log-warning.po b/cinder/locale/en_GB/LC_MESSAGES/cinder-log-warning.po
index bb4b9670c08..d38af34ce70 100644
--- a/cinder/locale/en_GB/LC_MESSAGES/cinder-log-warning.po
+++ b/cinder/locale/en_GB/LC_MESSAGES/cinder-log-warning.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:08+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "cinder/language/en_GB/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: cinder/openstack/common/loopingcall.py:87
+#, python-format
+msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
+msgstr "task %(func_name)s run outlasted interval by %(delay).2f sec"
+
 #: cinder/openstack/common/network_utils.py:146
 msgid "tcp_keepidle not available on your system"
 msgstr "tcp_keepidle not available on your system"
@@ -30,3 +35,8 @@ msgstr "tcp_keepintvl not available on your system"
 #: cinder/openstack/common/network_utils.py:160
 msgid "tcp_keepknt not available on your system"
 msgstr "tcp_keepknt not available on your system"
+
+#: cinder/openstack/common/service.py:364
+#, python-format
+msgid "pid %d not in child list"
+msgstr "pid %d not in child list"
diff --git a/cinder/locale/en_US/LC_MESSAGES/cinder.po b/cinder/locale/en_US/LC_MESSAGES/cinder.po
index cac40892176..47b120ee265 100644
--- a/cinder/locale/en_US/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_US/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:08+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
 "PO-Revision-Date: 2013-05-08 11:44+0000\n"
 "Last-Translator: markmc <markmc@redhat.com>\n"
 "Language-Team: en_US <LL@li.org>\n"
@@ -240,62 +240,47 @@ msgstr "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgid "No target id found for volume %(volume_id)s."
 msgstr "No target id found for volume %(volume_id)s."
 
-#: cinder/exception.py:298 cinder/brick/exception.py:108
-#, python-format
-msgid "Failed to create iscsi target for volume %(volume_id)s."
-msgstr "Failed to create iscsi target for volume %(volume_id)s."
-
-#: cinder/exception.py:302 cinder/brick/exception.py:112
-#, python-format
-msgid "Failed to remove iscsi target for volume %(volume_id)s."
-msgstr "Failed to remove iscsi target for volume %(volume_id)s."
-
-#: cinder/exception.py:306 cinder/brick/exception.py:116
-#, python-format
-msgid "Failed to attach iSCSI target for volume %(volume_id)s."
-msgstr "Failed to attach iSCSI target for volume %(volume_id)s."
-
-#: cinder/exception.py:310
+#: cinder/exception.py:298
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Invalid image href %(image_href)s."
 
-#: cinder/exception.py:314
+#: cinder/exception.py:302
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Image %(image_id)s could not be found."
 
-#: cinder/exception.py:318
+#: cinder/exception.py:306
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Service %(service_id)s could not be found."
 
-#: cinder/exception.py:322
+#: cinder/exception.py:310
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Host %(host)s could not be found."
 
-#: cinder/exception.py:326
+#: cinder/exception.py:314
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "Scheduler Host Filter %(filter_name)s could not be found."
 
-#: cinder/exception.py:330
+#: cinder/exception.py:318
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr "Scheduler Host Weigher %(weigher_name)s could not be found."
 
-#: cinder/exception.py:334
+#: cinder/exception.py:322
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "Could not find binary %(binary)s on host %(host)s."
 
-#: cinder/exception.py:338
+#: cinder/exception.py:326
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: cinder/exception.py:342
+#: cinder/exception.py:330
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
@@ -304,145 +289,145 @@ msgstr ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 
-#: cinder/exception.py:347
+#: cinder/exception.py:335
 msgid "Quota could not be found"
 msgstr "Quota could not be found"
 
-#: cinder/exception.py:351
+#: cinder/exception.py:339
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr "Unknown quota resources %(unknown)s."
 
-#: cinder/exception.py:355
+#: cinder/exception.py:343
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Quota for project %(project_id)s could not be found."
 
-#: cinder/exception.py:359
+#: cinder/exception.py:347
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Quota class %(class_name)s could not be found."
 
-#: cinder/exception.py:363
+#: cinder/exception.py:351
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Quota usage for project %(project_id)s could not be found."
 
-#: cinder/exception.py:367
+#: cinder/exception.py:355
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Quota reservation %(uuid)s could not be found."
 
-#: cinder/exception.py:371
+#: cinder/exception.py:359
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Quota exceeded for resources: %(overs)s"
 
-#: cinder/exception.py:375
+#: cinder/exception.py:363
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "File %(file_path)s could not be found."
 
-#: cinder/exception.py:384
+#: cinder/exception.py:372
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr "Volume Type %(id)s already exists."
 
-#: cinder/exception.py:388
+#: cinder/exception.py:376
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:392
+#: cinder/exception.py:380
 #, python-format
 msgid "Volume type encryption for type %(type_id)s does not exist."
 msgstr ""
 
-#: cinder/exception.py:396
+#: cinder/exception.py:384
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Malformed message body: %(reason)s"
 
-#: cinder/exception.py:400
+#: cinder/exception.py:388
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Could not find config at %(path)s"
 
-#: cinder/exception.py:404
+#: cinder/exception.py:392
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "Could not find config at %(param)s"
 
-#: cinder/exception.py:408
+#: cinder/exception.py:396
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "Could not load paste app '%(name)s' from %(path)s"
 
-#: cinder/exception.py:412
+#: cinder/exception.py:400
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "No valid host was found. %(reason)s"
 
-#: cinder/exception.py:421
+#: cinder/exception.py:409
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:428
+#: cinder/exception.py:416
 #, python-format
 msgid ""
 "Requested volume or snapshot exceeds allowed Gigabytes quota. Requested "
 "%(requested)sG, quota is %(quota)sG and %(consumed)sG has been consumed."
 msgstr ""
 
-#: cinder/exception.py:434
+#: cinder/exception.py:422
 #, python-format
 msgid ""
 "Requested backup exceeds allowed Backup Gigabytes quota. Requested "
 "%(requested)sG, quota is %(quota)sG and %(consumed)sG has been consumed."
 msgstr ""
 
-#: cinder/exception.py:440
+#: cinder/exception.py:428
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr "Maximum number of volumes allowed (%(allowed)d) exceeded"
 
-#: cinder/exception.py:444
+#: cinder/exception.py:432
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 
-#: cinder/exception.py:448
+#: cinder/exception.py:436
 #, python-format
 msgid "Maximum number of backups allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:452
+#: cinder/exception.py:440
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr "Detected more than one volume with name %(vol_name)s"
 
-#: cinder/exception.py:456
+#: cinder/exception.py:444
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 
-#: cinder/exception.py:461
+#: cinder/exception.py:449
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr "Unknown or unsupported command %(cmd)s"
 
-#: cinder/exception.py:465
+#: cinder/exception.py:453
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr "Malformed response to command %(cmd)s: %(reason)s"
 
-#: cinder/exception.py:469
+#: cinder/exception.py:457
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr "Operation failed with status=%(status)s. Full dump: %(data)s"
 
-#: cinder/exception.py:473
+#: cinder/exception.py:461
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
@@ -451,374 +436,391 @@ msgstr ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 
-#: cinder/exception.py:478
+#: cinder/exception.py:466
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:482
+#: cinder/exception.py:470
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:486
+#: cinder/exception.py:474
 #, python-format
 msgid "Failed to remove export for volume %(volume)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:490
+#: cinder/exception.py:478
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:494
+#: cinder/exception.py:482
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:498
+#: cinder/exception.py:486
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:502
+#: cinder/exception.py:490
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "Failed to copy image to volume: %(reason)s"
 
-#: cinder/exception.py:506
+#: cinder/exception.py:494
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:510
+#: cinder/exception.py:498
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:514
+#: cinder/exception.py:502
 msgid "Unsupported backup metadata version requested"
 msgstr ""
 
-#: cinder/exception.py:518
+#: cinder/exception.py:506
+msgid "Unsupported backup verify driver"
+msgstr ""
+
+#: cinder/exception.py:510
 msgid "Metadata backup already exists for this volume"
 msgstr ""
 
-#: cinder/exception.py:522
+#: cinder/exception.py:514
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:526
+#: cinder/exception.py:518
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr "Backup %(backup_id)s could not be found."
 
-#: cinder/exception.py:530
+#: cinder/exception.py:522
 msgid "Failed to identify volume backend."
 msgstr ""
 
-#: cinder/exception.py:534
+#: cinder/exception.py:526
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr "Invalid backup: %(reason)s"
 
-#: cinder/exception.py:538
+#: cinder/exception.py:530
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:542
+#: cinder/exception.py:534
 #, fuzzy, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr "Transfer %(transfer_id)s could not be found."
 
-#: cinder/exception.py:546
+#: cinder/exception.py:538
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:550
+#: cinder/exception.py:542
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:554
+#: cinder/exception.py:546
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:550
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:563
+#: cinder/exception.py:555
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:568
+#: cinder/exception.py:560
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:572
+#: cinder/exception.py:564
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:577
+#: cinder/exception.py:569
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:574
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:587
+#: cinder/exception.py:579
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:591
+#: cinder/exception.py:583
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
 
-#: cinder/exception.py:595
+#: cinder/exception.py:587
 #, python-format
 msgid "key manager error: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:599
+#: cinder/exception.py:591
 #, python-format
 msgid ""
 "Manage existing volume failed due to invalid backend reference "
 "%(existing_ref)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:604
+#: cinder/exception.py:596
 #, python-format
 msgid "Volume %(volume_id)s replication error: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:609
+#: cinder/exception.py:601
 #, python-format
 msgid "Volume replication for %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:606
 #, python-format
 msgid "Manage existing volume failed due to volume type mismatch: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:619
+#: cinder/exception.py:611
 #, python-format
 msgid "Error extending volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:625
+#: cinder/exception.py:617
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:629
+#: cinder/exception.py:621
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:633
+#: cinder/exception.py:625
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:637
+#: cinder/exception.py:629
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:641
+#: cinder/exception.py:633
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:645
+#: cinder/exception.py:637
 #, python-format
 msgid "ESM configure request failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:649
+#: cinder/exception.py:641
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:646
 #, python-format
 msgid "Pure Storage Cinder driver failure: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:658
+#: cinder/exception.py:650
 #, python-format
 msgid "Bad response from Pure Storage REST API: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:663
+#: cinder/exception.py:655
 msgid "Zadara Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:667
+#: cinder/exception.py:659
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr "Unable to create server object for initiator %(name)s"
 
-#: cinder/exception.py:671
+#: cinder/exception.py:663
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr "Unable to find server object for initiator %(name)s"
 
-#: cinder/exception.py:675
+#: cinder/exception.py:667
 msgid "Unable to find any active VPSA controller"
 msgstr "Unable to find any active VPSA controller"
 
-#: cinder/exception.py:679
+#: cinder/exception.py:671
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr "Failed to retrieve attachments for volume %(name)s"
 
-#: cinder/exception.py:683
+#: cinder/exception.py:675
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr "Invalid attachment info for volume %(name)s: %(reason)s"
 
-#: cinder/exception.py:687
+#: cinder/exception.py:679
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr "Bad HTTP response status %(status)s"
 
-#: cinder/exception.py:692
+#: cinder/exception.py:684
 msgid "Bad response from SolidFire API"
 msgstr "Bad response from SolidFire API"
 
-#: cinder/exception.py:696
+#: cinder/exception.py:688
 msgid "SolidFire Cinder Driver exception"
 msgstr ""
 
-#: cinder/exception.py:700
+#: cinder/exception.py:692
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr "Error in SolidFire API response: data=%(data)s"
 
-#: cinder/exception.py:704
+#: cinder/exception.py:696
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr "Unable to locate account %(account_name)s on Solidfire device"
 
-#: cinder/exception.py:710
+#: cinder/exception.py:702
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr "Invalid 3PAR Domain: %(err)s"
 
-#: cinder/exception.py:715
+#: cinder/exception.py:707
 msgid "Unknown RemoteFS exception"
 msgstr ""
 
-#: cinder/exception.py:719
+#: cinder/exception.py:711
 msgid "No mounted shares found"
 msgstr ""
 
-#: cinder/exception.py:723 cinder/exception.py:736 cinder/exception.py:749
+#: cinder/exception.py:715 cinder/exception.py:728 cinder/exception.py:754
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr "There is no share which can host %(volume_size)sG"
 
-#: cinder/exception.py:728
+#: cinder/exception.py:720
 msgid "Unknown NFS exception"
 msgstr "Unknown NFS exception"
 
-#: cinder/exception.py:732
+#: cinder/exception.py:724
 msgid "No mounted NFS shares found"
 msgstr "No mounted NFS shares found"
 
+#: cinder/exception.py:733
+msgid "Unknown SMBFS exception."
+msgstr ""
+
+#: cinder/exception.py:737
+msgid "No mounted SMBFS shares found."
+msgstr ""
+
 #: cinder/exception.py:741
+#, python-format
+msgid "There is no share which can host %(volume_size)sG."
+msgstr ""
+
+#: cinder/exception.py:746
 msgid "Unknown Gluster exception"
 msgstr "Unknown Gluster exception"
 
-#: cinder/exception.py:745
+#: cinder/exception.py:750
 msgid "No mounted Gluster shares found"
 msgstr "No mounted Gluster shares found"
 
-#: cinder/exception.py:754
+#: cinder/exception.py:759
 msgid "HP MSA Volume Driver exception"
 msgstr ""
 
-#: cinder/exception.py:758
+#: cinder/exception.py:763
 #, python-format
 msgid "VDisk doesn't exist (%(vdisk)s)"
 msgstr ""
 
-#: cinder/exception.py:762
+#: cinder/exception.py:767
 msgid "Unable to connect to MSA array"
 msgstr ""
 
-#: cinder/exception.py:766
-#, python-format
-msgid "Not enough space on VDisk (%(vdisk)s)"
-msgstr ""
-
 #: cinder/exception.py:771
 #, python-format
+msgid "Not enough space on VDisk (%(vdisk)s)"
+msgstr ""
+
+#: cinder/exception.py:776
+#, python-format
 msgid "Fibre Channel connection control failure: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:775
+#: cinder/exception.py:780
 #, python-format
 msgid "Fibre Channel Zone operation failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:779
+#: cinder/exception.py:784
 #, python-format
 msgid "Fibre Channel SAN Lookup failure: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:783 cinder/exception.py:787
+#: cinder/exception.py:788 cinder/exception.py:792
 #, python-format
 msgid "Fibre Channel Zoning CLI error: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:791
+#: cinder/exception.py:796
 msgid "NetApp Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:800
+#: cinder/exception.py:805
 #, python-format
 msgid "EMCVnxCLICmdError : %(cmd)s (Return Code: %(rc)s) (Output: %(out)s) "
 msgstr ""
 
-#: cinder/exception.py:816
+#: cinder/exception.py:821
 #, python-format
 msgid "ConsistencyGroup %(consistencygroup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:820
+#: cinder/exception.py:825
 #, python-format
 msgid "Invalid ConsistencyGroup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:825
+#: cinder/exception.py:830
 #, python-format
 msgid "CgSnapshot %(cgsnapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:829
+#: cinder/exception.py:834
 #, python-format
 msgid "Invalid CgSnapshot: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:834
+#: cinder/exception.py:839
 msgid "HBSD error occurs."
 msgstr ""
 
-#: cinder/exception.py:851
+#: cinder/exception.py:856
 msgid "Storage resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:856
+#: cinder/exception.py:861
 msgid "Bad response from Datera API"
 msgstr ""
 
@@ -955,86 +957,86 @@ msgstr "Error connecting via ssh: %s"
 msgid "Can not translate %s to integer."
 msgstr ""
 
-#: cinder/utils.py:126
+#: cinder/utils.py:134
 #, python-format
 msgid "May specify only one of %s"
 msgstr ""
 
-#: cinder/utils.py:283
+#: cinder/utils.py:291
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: cinder/utils.py:610
+#: cinder/utils.py:618
 #, python-format
 msgid "Volume driver %s not initialized"
 msgstr ""
 
-#: cinder/utils.py:667
+#: cinder/utils.py:675
 #, python-format
 msgid "Unable to get a block device for file '%s'"
 msgstr ""
 
-#: cinder/utils.py:679
+#: cinder/utils.py:687
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: cinder/utils.py:683
+#: cinder/utils.py:691
 #, python-format
 msgid "%(name)s has a minimum character requirement of %(min_length)s."
 msgstr ""
 
-#: cinder/utils.py:688
+#: cinder/utils.py:696
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: cinder/wsgi.py:145 cinder/openstack/common/sslutils.py:50
+#: cinder/wsgi.py:146 cinder/openstack/common/sslutils.py:50
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Unable to find cert_file : %s"
 
-#: cinder/wsgi.py:149 cinder/openstack/common/sslutils.py:53
+#: cinder/wsgi.py:150 cinder/openstack/common/sslutils.py:53
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Unable to find ca_file : %s"
 
-#: cinder/wsgi.py:152 cinder/openstack/common/sslutils.py:56
+#: cinder/wsgi.py:153 cinder/openstack/common/sslutils.py:56
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Unable to find key_file : %s"
 
-#: cinder/wsgi.py:156
+#: cinder/wsgi.py:157
 msgid ""
 "When running server in SSL mode, you must specify both a cert_file and "
 "key_file option value in your configuration file."
 msgstr ""
 
-#: cinder/wsgi.py:172
+#: cinder/wsgi.py:173
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds"
 msgstr "Could not bind to %(host)s:%(port)s after trying for 30 seconds"
 
-#: cinder/wsgi.py:177
+#: cinder/wsgi.py:178
 #, python-format
 msgid "%(name)s listening on %(_host)s:%(_port)s"
 msgstr ""
 
-#: cinder/wsgi.py:218
+#: cinder/wsgi.py:223
 #, python-format
 msgid "Failed to start %(name)s on %(_host)s:%(_port)s with SSL support."
 msgstr ""
 
-#: cinder/wsgi.py:249
+#: cinder/wsgi.py:254
 msgid "Stopping WSGI server."
 msgstr "Stopping WSGI server."
 
-#: cinder/wsgi.py:267
+#: cinder/wsgi.py:272
 msgid "WSGI server has stopped."
 msgstr "WSGI server has stopped."
 
-#: cinder/wsgi.py:344
+#: cinder/wsgi.py:349
 msgid "You must implement __call__"
 msgstr "You must implement __call__"
 
@@ -1058,12 +1060,12 @@ msgid ""
 msgstr ""
 
 #: cinder/api/common.py:94 cinder/api/common.py:128
-#: cinder/consistencygroup/api.py:305 cinder/volume/api.py:329
+#: cinder/consistencygroup/api.py:312 cinder/volume/api.py:373
 msgid "limit param must be an integer"
 msgstr "limit param must be an integer"
 
 #: cinder/api/common.py:97 cinder/api/common.py:132
-#: cinder/consistencygroup/api.py:302 cinder/volume/api.py:326
+#: cinder/consistencygroup/api.py:309 cinder/volume/api.py:370
 msgid "limit param must be positive"
 msgstr "limit param must be positive"
 
@@ -1146,44 +1148,44 @@ msgstr "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)
 msgid "subclasses must implement construct()!"
 msgstr "subclasses must implement construct()!"
 
-#: cinder/api/contrib/admin_actions.py:65
+#: cinder/api/contrib/admin_actions.py:67
 msgid "Must specify 'status'"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:68
+#: cinder/api/contrib/admin_actions.py:70
 msgid "Must specify a valid status"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:82
+#: cinder/api/contrib/admin_actions.py:84
 #, python-format
 msgid "Updating %(resource)s '%(id)s' with '%(update)r'"
 msgstr "Updating %(resource)s '%(id)s' with '%(update)r'"
 
-#: cinder/api/contrib/admin_actions.py:158
+#: cinder/api/contrib/admin_actions.py:160
 msgid "Must specify a valid attach status"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:165
+#: cinder/api/contrib/admin_actions.py:167
 msgid "Must specify a valid migration status"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:171
+#: cinder/api/contrib/admin_actions.py:173
 msgid "Must specify 'status', 'attach_status' or 'migration_status' for update."
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:202
+#: cinder/api/contrib/admin_actions.py:204
 msgid "Must specify 'host'"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:210
+#: cinder/api/contrib/admin_actions.py:212
 msgid "Bad value for 'force_host_copy'"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:213
+#: cinder/api/contrib/admin_actions.py:215
 msgid "'force_host_copy' not string or bool"
 msgstr ""
 
-#: cinder/api/contrib/admin_actions.py:231
+#: cinder/api/contrib/admin_actions.py:233
 msgid "Must specify 'new_volume'"
 msgstr ""
 
@@ -1194,9 +1196,9 @@ msgstr "Delete backup with id: %s"
 
 #: cinder/api/contrib/backups.py:244 cinder/api/contrib/backups.py:276
 #: cinder/api/contrib/cgsnapshots.py:168
-#: cinder/api/contrib/consistencygroups.py:174
-#: cinder/api/contrib/volume_transfer.py:157
-#: cinder/api/contrib/volume_transfer.py:193
+#: cinder/api/contrib/consistencygroups.py:173
+#: cinder/api/contrib/volume_transfer.py:158
+#: cinder/api/contrib/volume_transfer.py:194
 msgid "Incorrect request body format"
 msgstr "Incorrect request body format"
 
@@ -1236,7 +1238,6 @@ msgid "'consistencygroup_id' must be specified"
 msgstr ""
 
 #: cinder/api/contrib/cgsnapshots.py:180
-#: cinder/api/contrib/consistencygroups.py:128
 msgid "Consistency group could not be found"
 msgstr ""
 
@@ -1250,11 +1251,17 @@ msgstr ""
 msgid "Delete consistency group with id: %s"
 msgstr ""
 
-#: cinder/api/contrib/consistencygroups.py:131
-msgid "Invalid consistency group"
+#: cinder/api/contrib/consistencygroups.py:128
+#, python-format
+msgid "Consistency group %s could not be found."
 msgstr ""
 
-#: cinder/api/contrib/consistencygroups.py:181
+#: cinder/api/contrib/consistencygroups.py:179
+#, python-format
+msgid "volume_types must be provided to create consistency group %(name)s."
+msgstr ""
+
+#: cinder/api/contrib/consistencygroups.py:184
 #, python-format
 msgid "Creating consistency group %(name)s."
 msgstr ""
@@ -1529,17 +1536,17 @@ msgstr ""
 msgid "Attempting to sync secondary replica with primary for volume %s."
 msgstr ""
 
-#: cinder/api/contrib/volume_transfer.py:162
+#: cinder/api/contrib/volume_transfer.py:163
 #, fuzzy, python-format
 msgid "Creating transfer of volume %s"
 msgstr "Creating transfer of volume %s"
 
-#: cinder/api/contrib/volume_transfer.py:196
+#: cinder/api/contrib/volume_transfer.py:197
 #, fuzzy, python-format
 msgid "Accepting transfer %s"
 msgstr "Accepting transfer %s"
 
-#: cinder/api/contrib/volume_transfer.py:217
+#: cinder/api/contrib/volume_transfer.py:218
 #, fuzzy, python-format
 msgid "Delete transfer with id: %s"
 msgstr "Delete transfer with id: %s"
@@ -1885,7 +1892,7 @@ msgstr ""
 msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 msgstr "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
 
-#: cinder/backup/api.py:275
+#: cinder/backup/api.py:290
 #, python-format
 msgid "Backup status must be available and not %s."
 msgstr ""
@@ -1906,110 +1913,110 @@ msgstr ""
 msgid "Unsupported backup metadata version (%s)"
 msgstr ""
 
-#: cinder/backup/manager.py:107
+#: cinder/backup/manager.py:108
 msgid "NULL host not allowed for volume backend lookup."
 msgstr ""
 
-#: cinder/backup/manager.py:117
+#: cinder/backup/manager.py:118
 #, python-format
 msgid "Backend not found in hostname (%s) so using default."
 msgstr ""
 
-#: cinder/backup/manager.py:133
+#: cinder/backup/manager.py:134
 #, python-format
 msgid "Volume manager for backend '%s' does not exist."
 msgstr ""
 
-#: cinder/backup/manager.py:168
+#: cinder/backup/manager.py:169
 #, python-format
 msgid "Starting volume driver %(driver_name)s (%(version)s)."
 msgstr ""
 
-#: cinder/backup/manager.py:175
+#: cinder/backup/manager.py:176
 #, python-format
 msgid "Error encountered during initialization of driver: %(name)s."
 msgstr ""
 
-#: cinder/backup/manager.py:194
+#: cinder/backup/manager.py:195
 msgid "Cleaning up incomplete backup operations."
 msgstr ""
 
-#: cinder/backup/manager.py:200
+#: cinder/backup/manager.py:201
 #, python-format
 msgid "Resetting volume %s to available (was backing-up)."
 msgstr ""
 
-#: cinder/backup/manager.py:205
+#: cinder/backup/manager.py:206
 #, python-format
 msgid "Resetting volume %s to error_restoring (was restoring-backup)."
 msgstr ""
 
-#: cinder/backup/manager.py:217
+#: cinder/backup/manager.py:218
 #, python-format
 msgid "Resetting backup %s to error (was creating)."
 msgstr ""
 
-#: cinder/backup/manager.py:223
+#: cinder/backup/manager.py:224
 #, python-format
 msgid "Resetting backup %s to available (was restoring)."
 msgstr ""
 
-#: cinder/backup/manager.py:228
+#: cinder/backup/manager.py:229
 #, python-format
 msgid "Resuming delete on backup: %s."
 msgstr ""
 
-#: cinder/backup/manager.py:236
+#: cinder/backup/manager.py:237
 #, python-format
 msgid "Create backup started, backup: %(backup_id)s volume: %(volume_id)s."
 msgstr ""
 
-#: cinder/backup/manager.py:249
+#: cinder/backup/manager.py:250
 #, python-format
 msgid ""
 "Create backup aborted, expected volume status %(expected_status)s but got"
 " %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:261
+#: cinder/backup/manager.py:262
 #, python-format
 msgid ""
 "Create backup aborted, expected backup status %(expected_status)s but got"
 " %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:294
+#: cinder/backup/manager.py:295
 #, python-format
 msgid "Create backup finished. backup: %s."
 msgstr ""
 
-#: cinder/backup/manager.py:298
+#: cinder/backup/manager.py:299
 #, python-format
 msgid "Restore backup started, backup: %(backup_id)s volume: %(volume_id)s."
 msgstr ""
 
-#: cinder/backup/manager.py:312
+#: cinder/backup/manager.py:313
 #, python-format
 msgid ""
 "Restore backup aborted, expected volume status %(expected_status)s but "
 "got %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:322
+#: cinder/backup/manager.py:323
 #, python-format
 msgid ""
 "Restore backup aborted: expected backup status %(expected_status)s but "
 "got %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:332
+#: cinder/backup/manager.py:333
 #, python-format
 msgid ""
 "Volume: %(vol_id)s, size: %(vol_size)d is larger than backup: "
 "%(backup_id)s, size: %(backup_size)d, continuing with restore."
 msgstr ""
 
-#: cinder/backup/manager.py:343
+#: cinder/backup/manager.py:344
 #, python-format
 msgid ""
 "Restore backup aborted, the backup service currently configured "
@@ -2017,26 +2024,26 @@ msgid ""
 "create this backup [%(backup_service)s]."
 msgstr ""
 
-#: cinder/backup/manager.py:374
+#: cinder/backup/manager.py:375
 #, python-format
 msgid ""
 "Restore backup finished, backup %(backup_id)s restored to volume "
 "%(volume_id)s."
 msgstr ""
 
-#: cinder/backup/manager.py:393
+#: cinder/backup/manager.py:394
 #, python-format
 msgid "Delete backup started, backup: %s."
 msgstr ""
 
-#: cinder/backup/manager.py:400
+#: cinder/backup/manager.py:401
 #, python-format
 msgid ""
 "Delete_backup aborted, expected backup status %(expected_status)s but got"
 " %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:412
+#: cinder/backup/manager.py:413
 #, python-format
 msgid ""
 "Delete backup aborted, the backup service currently configured "
@@ -2044,28 +2051,28 @@ msgid ""
 "create this backup [%(backup_service)s]."
 msgstr ""
 
-#: cinder/backup/manager.py:443
+#: cinder/backup/manager.py:444
 msgid "Failed to update usages deleting backup"
 msgstr ""
 
-#: cinder/backup/manager.py:453
+#: cinder/backup/manager.py:454
 #, python-format
 msgid "Delete backup finished, backup %s deleted."
 msgstr ""
 
-#: cinder/backup/manager.py:468
+#: cinder/backup/manager.py:469
 #, python-format
 msgid "Export record started, backup: %s."
 msgstr ""
 
-#: cinder/backup/manager.py:475
+#: cinder/backup/manager.py:476
 #, python-format
 msgid ""
 "Export backup aborted, expected backup status %(expected_status)s but got"
 " %(actual_status)s."
 msgstr ""
 
-#: cinder/backup/manager.py:486
+#: cinder/backup/manager.py:487
 #, python-format
 msgid ""
 "Export record aborted, the backup service currently configured "
@@ -2073,40 +2080,81 @@ msgid ""
 "create this backup [%(backup_service)s]."
 msgstr ""
 
-#: cinder/backup/manager.py:504
+#: cinder/backup/manager.py:505
 #, python-format
 msgid "Export record finished, backup %s exported."
 msgstr ""
 
-#: cinder/backup/manager.py:523
+#: cinder/backup/manager.py:524
 #, python-format
 msgid "Import record started, backup_url: %s."
 msgstr ""
 
-#: cinder/backup/manager.py:539
+#: cinder/backup/manager.py:540
 #, python-format
 msgid ""
 "Import record failed, cannot find backup service to perform the import. "
 "Request service %(service)s"
 msgstr ""
 
-#: cinder/backup/manager.py:574
+#: cinder/backup/manager.py:575
 #, python-format
 msgid "Backup metadata received from driver for import is missing %s."
 msgstr ""
 
-#: cinder/backup/manager.py:590
+#: cinder/backup/manager.py:591
 #, python-format
 msgid ""
 "Backup service %(service)s does not support verify. Backup id %(id)s is "
 "not verified. Skipping verify."
 msgstr ""
 
-#: cinder/backup/manager.py:602
+#: cinder/backup/manager.py:603
 #, python-format
 msgid "Import record id %s metadata from driver finished."
 msgstr ""
 
+#: cinder/backup/manager.py:616
+#, python-format
+msgid "Reset backup status started, backup_id: %(backup_id)s, status: %(status)s."
+msgstr ""
+
+#: cinder/backup/manager.py:628
+msgid "Backup driver has not been initialized"
+msgstr ""
+
+#: cinder/backup/manager.py:632
+#, python-format
+msgid "Backup service: %s."
+msgstr ""
+
+#: cinder/backup/manager.py:636
+#, python-format
+msgid ""
+"Reset backup status aborted, the backup service currently configured "
+"[%(configured_service)s] is not the backup service that was used to "
+"create this backup [%(backup_service)s]."
+msgstr ""
+
+#: cinder/backup/manager.py:655 cinder/backup/manager.py:677
+#, python-format
+msgid ""
+"Backup service %(configured_service)s does not support verify. Backup id "
+"%(id)s is not verified. Skipping verify."
+msgstr ""
+
+#: cinder/backup/manager.py:672
+#, python-format
+msgid "Backup id %(id)s is not invalid. Skipping reset."
+msgstr ""
+
+#: cinder/backup/manager.py:685
+#, python-format
+msgid ""
+"Backup service %(service)s does not support verify. Backup id %(id)s is "
+"not verified. Skipping reset."
+msgstr ""
+
 #: cinder/backup/drivers/ceph.py:129 cinder/tests/test_backup_ceph.py:968
 #, python-format
 msgid "Metadata backup object '%s' already exists"
@@ -2459,6 +2507,21 @@ msgstr ""
 msgid "Failed to create Volume Group: %(vg_name)s"
 msgstr ""
 
+#: cinder/brick/exception.py:108
+#, python-format
+msgid "Failed to create iscsi target for volume %(volume_id)s."
+msgstr "Failed to create iscsi target for volume %(volume_id)s."
+
+#: cinder/brick/exception.py:112
+#, python-format
+msgid "Failed to remove iscsi target for volume %(volume_id)s."
+msgstr "Failed to remove iscsi target for volume %(volume_id)s."
+
+#: cinder/brick/exception.py:116
+#, python-format
+msgid "Failed to attach iSCSI target for volume %(volume_id)s."
+msgstr "Failed to attach iSCSI target for volume %(volume_id)s."
+
 #: cinder/brick/exception.py:120
 #, python-format
 msgid "Connect to volume via protocol %(protocol)s not supported."
@@ -2535,29 +2598,28 @@ msgstr ""
 msgid "Couldn't find multipath device %(line)s"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:139 cinder/volume/targets/tgt.py:87
+#: cinder/brick/iscsi/iscsi.py:139
 msgid "Attempting recreate of backing lun..."
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:157 cinder/volume/targets/tgt.py:104
+#: cinder/brick/iscsi/iscsi.py:157
 #, python-format
 msgid ""
 "Failed to recover attempt to create iscsi backing lun for volume "
 "id:%(vol_id)s: %(e)s"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:178 cinder/volume/targets/tgt.py:169
+#: cinder/brick/iscsi/iscsi.py:178
 #, python-format
 msgid "Creating iscsi_target for: %s"
 msgstr "Creating iscsi_target for: %s"
 
 #: cinder/brick/iscsi/iscsi.py:217 cinder/brick/iscsi/iscsi.py:375
-#: cinder/volume/targets/tgt.py:208
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume id:%(vol_id)s: %(e)s"
 msgstr "Failed to create iscsi target for volume id:%(vol_id)s: %(e)s"
 
-#: cinder/brick/iscsi/iscsi.py:228 cinder/volume/targets/tgt.py:219
+#: cinder/brick/iscsi/iscsi.py:228
 #, python-format
 msgid ""
 "Failed to create iscsi target for volume id:%(vol_id)s. Please ensure "
@@ -2566,28 +2628,26 @@ msgstr ""
 "Failed to create iscsi target for volume id:%(vol_id)s. Please ensure "
 "your tgtd config file contains 'include %(volumes_dir)s/*'"
 
-#: cinder/brick/iscsi/iscsi.py:258 cinder/volume/targets/tgt.py:304
+#: cinder/brick/iscsi/iscsi.py:258
 #, python-format
 msgid "Removing iscsi_target for: %s"
 msgstr "Removing iscsi_target for: %s"
 
-#: cinder/brick/iscsi/iscsi.py:262 cinder/volume/targets/tgt.py:308
+#: cinder/brick/iscsi/iscsi.py:262
 #, python-format
 msgid "Volume path %s does not exist, nothing to remove."
 msgstr ""
 
 #: cinder/brick/iscsi/iscsi.py:280 cinder/brick/iscsi/iscsi.py:304
-#: cinder/volume/targets/tgt.py:326 cinder/volume/targets/tgt.py:349
 #, fuzzy, python-format
 msgid "Failed to remove iscsi target for volume id:%(vol_id)s: %(e)s"
 msgstr "Failed to remove iscsi target for volume id:%(vol_id)s: %(e)s"
 
-#: cinder/brick/iscsi/iscsi.py:297 cinder/volume/targets/tgt.py:342
+#: cinder/brick/iscsi/iscsi.py:297
 msgid "Silent failure of target removal detected, retry...."
 msgstr ""
 
 #: cinder/brick/iscsi/iscsi.py:322 cinder/brick/iscsi/iscsi.py:554
-#: cinder/volume/targets/lio.py:148 cinder/volume/targets/tgt.py:367
 msgid "valid iqn needed for show_target"
 msgstr "valid iqn needed for show_target"
 
@@ -2596,32 +2656,31 @@ msgstr "valid iqn needed for show_target"
 msgid "Removing iscsi_target for volume: %s"
 msgstr "Removing iscsi_target for volume: %s"
 
-#: cinder/brick/iscsi/iscsi.py:476 cinder/volume/targets/lio.py:70
+#: cinder/brick/iscsi/iscsi.py:476
 msgid "cinder-rtstool is not installed correctly"
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:496 cinder/volume/targets/lio.py:90
+#: cinder/brick/iscsi/iscsi.py:496
 #, python-format
 msgid "Creating iscsi_target for volume: %s"
 msgstr "Creating iscsi_target for volume: %s"
 
 #: cinder/brick/iscsi/iscsi.py:520 cinder/brick/iscsi/iscsi.py:529
-#: cinder/volume/targets/lio.py:114 cinder/volume/targets/lio.py:123
 #, python-format
 msgid "Failed to create iscsi target for volume id:%s."
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:536 cinder/volume/targets/lio.py:130
+#: cinder/brick/iscsi/iscsi.py:536
 #, python-format
 msgid "Removing iscsi_target: %s"
 msgstr "Removing iscsi_target: %s"
 
-#: cinder/brick/iscsi/iscsi.py:546 cinder/volume/targets/lio.py:140
+#: cinder/brick/iscsi/iscsi.py:546
 #, python-format
 msgid "Failed to remove iscsi target for volume id:%s."
 msgstr ""
 
-#: cinder/brick/iscsi/iscsi.py:575 cinder/volume/targets/lio.py:169
+#: cinder/brick/iscsi/iscsi.py:575
 #, python-format
 msgid "Failed to add initiator iqn %s to target"
 msgstr "Failed to add initiator iqn %s to target"
@@ -2710,24 +2769,28 @@ msgid "nfs_mount_point_base required"
 msgstr ""
 
 #: cinder/brick/remotefs/remotefs.py:49
+msgid "smbfs_mount_point_base required"
+msgstr ""
+
+#: cinder/brick/remotefs/remotefs.py:55
 msgid "glusterfs_mount_point_base required"
 msgstr ""
 
-#: cinder/brick/remotefs/remotefs.py:90
+#: cinder/brick/remotefs/remotefs.py:96
 #, python-format
 msgid "Already mounted: %s"
 msgstr ""
 
-#: cinder/brick/remotefs/remotefs.py:130
+#: cinder/brick/remotefs/remotefs.py:136
 #, python-format
-msgid "NFS mount failed for share %(sh)s.Error - %(error)s"
-msgstr ""
-
-#: cinder/common/config.py:119
-msgid "DEPRECATED: Deploy v1 of the Cinder API."
+msgid "NFS mount failed for share %(sh)s. Error - %(error)s"
 msgstr ""
 
 #: cinder/common/config.py:122
+msgid "DEPRECATED: Deploy v1 of the Cinder API."
+msgstr ""
+
+#: cinder/common/config.py:125
 msgid "Deploy v2 of the Cinder API."
 msgstr ""
 
@@ -2745,59 +2808,59 @@ msgstr "Unknown sort direction, must be 'desc' or 'asc'"
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/consistencygroup/api.py:146
+#: cinder/consistencygroup/api.py:139
 #, python-format
 msgid "Error occurred when creating consistency group %s."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:209
+#: cinder/consistencygroup/api.py:202
 #, python-format
 msgid "Error occurred when building request spec list for consistency group %s."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:232
+#: cinder/consistencygroup/api.py:229
 #, python-format
-msgid "Failed to update quota for creatingconsistency group %s."
+msgid "Failed to update quota for consistency group %s."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:238
+#: cinder/consistencygroup/api.py:245
 #, python-format
 msgid ""
 "Consistency group status must be available or error, but current status "
 "is: %s"
 msgstr ""
 
-#: cinder/consistencygroup/api.py:246
+#: cinder/consistencygroup/api.py:253
 #, python-format
 msgid "Consistency group %s still has dependent cgsnapshots."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:255
+#: cinder/consistencygroup/api.py:262
 #, python-format
 msgid ""
 "Consistency group %s still contains volumes. The force flag is required "
 "to delete it."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:262
+#: cinder/consistencygroup/api.py:269
 #, python-format
 msgid "Volume in consistency group %s is attached. Need to detach first."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:270
+#: cinder/consistencygroup/api.py:277
 msgid "Volume in consistency group still has dependent snapshots."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:350
+#: cinder/consistencygroup/api.py:357
 msgid "Consistency group is empty. No cgsnapshot will be created."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:364 cinder/volume/manager.py:1808
+#: cinder/consistencygroup/api.py:371 cinder/volume/manager.py:1814
 #, python-format
 msgid "Error occurred when creating cgsnapshot %s."
 msgstr ""
 
-#: cinder/consistencygroup/api.py:373
+#: cinder/consistencygroup/api.py:380
 msgid "Cgsnapshot status must be available or error"
 msgstr ""
 
@@ -2899,8 +2962,8 @@ msgstr "Downgrade from initial Cinder install is unsupported."
 #: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49
 #: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:81
 #: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:52
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:78
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:53
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:79
 #, python-format
 msgid "Table |%s| not created!"
 msgstr "Table |%s| not created!"
@@ -3035,19 +3098,27 @@ msgid ""
 "exist."
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:89
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:90
 msgid "Adding consistencygroup_id column to volumes table failed."
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:102
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:103
 msgid "Adding cgsnapshot_id column to snapshots table failed."
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:126
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:127
+msgid "Dropping foreign key 'cgsnapshot_id' in the 'snapshots' table failed."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:149
+msgid "Dropping foreign key 'consistencygroup_id' in the 'volumes' table failed."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:161
 msgid "cgsnapshots table not dropped"
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:134
+#: cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py:169
 msgid "consistencygroups table not dropped"
 msgstr ""
 
@@ -3065,63 +3136,63 @@ msgstr ""
 msgid "Default consistencygroups quota class data not inserted into the DB."
 msgstr ""
 
-#: cinder/image/glance.py:171 cinder/image/glance.py:179
+#: cinder/image/glance.py:172 cinder/image/glance.py:180
 #, fuzzy, python-format
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 "Error contacting glance server '%(host)s:%(port)s' for '%(method)s', "
 "%(extra)s."
 
-#: cinder/image/image_utils.py:89
+#: cinder/image/image_utils.py:93
 #, python-format
 msgid "Converted %(sz).2f MB image at %(mbps).2f MB/s"
 msgstr ""
 
-#: cinder/image/image_utils.py:121
+#: cinder/image/image_utils.py:125
 #, python-format
 msgid "Image download %(sz).2f MB at %(mbps).2f MB/s"
 msgstr ""
 
-#: cinder/image/image_utils.py:135 cinder/image/image_utils.py:240
+#: cinder/image/image_utils.py:139 cinder/image/image_utils.py:244
 msgid "'qemu-img info' parsing failed."
 msgstr "'qemu-img info' parsing failed."
 
-#: cinder/image/image_utils.py:142
+#: cinder/image/image_utils.py:146
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:150 cinder/image/image_utils.py:233
+#: cinder/image/image_utils.py:154 cinder/image/image_utils.py:237
 #, python-format
 msgid ""
 "Size is %(image_size)dGB and doesn't fit in a volume of size "
 "%(volume_size)dGB."
 msgstr ""
 
-#: cinder/image/image_utils.py:198
+#: cinder/image/image_utils.py:202
 #, python-format
 msgid ""
 "qemu-img is not installed and image is of type %s.  Only RAW images can "
 "be used if qemu-img is not installed."
 msgstr ""
 
-#: cinder/image/image_utils.py:205
+#: cinder/image/image_utils.py:209
 msgid ""
 "qemu-img is not installed and the disk format is not specified.  Only RAW"
 " images can be used if qemu-img is not installed."
 msgstr ""
 
-#: cinder/image/image_utils.py:247
+#: cinder/image/image_utils.py:251
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr "fmt=%(fmt)s backed by:%(backing_file)s"
 
-#: cinder/image/image_utils.py:266
+#: cinder/image/image_utils.py:270
 #, python-format
 msgid "Converted to %(vol_format)s, but format is now %(file_format)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:303
+#: cinder/image/image_utils.py:307
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr "Converted to %(f1)s, but format is now %(f2)s"
@@ -3185,11 +3256,6 @@ msgstr ""
 msgid "Not deleting key %s"
 msgstr ""
 
-#: cinder/openstack/common/eventlet_backdoor.py:140
-#, python-format
-msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
-msgstr ""
-
 #: cinder/openstack/common/gettextutils.py:301
 msgid "Message objects do not support addition."
 msgstr ""
@@ -3234,45 +3300,26 @@ msgstr "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 
-#: cinder/openstack/common/log.py:289
+#: cinder/openstack/common/log.py:290
 #, python-format
 msgid "Deprecated: %s"
 msgstr "Deprecated: %s"
 
-#: cinder/openstack/common/log.py:397
+#: cinder/openstack/common/log.py:398
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr "Error loading logging config %(log_config)s: %(err_msg)s"
 
-#: cinder/openstack/common/log.py:458
+#: cinder/openstack/common/log.py:459
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "syslog facility must be one of: %s"
 
-#: cinder/openstack/common/log.py:709
+#: cinder/openstack/common/log.py:710
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Fatal call to deprecated config: %(msg)s"
 
-#: cinder/openstack/common/loopingcall.py:82
-#, python-format
-msgid "task run outlasted interval by %s sec"
-msgstr "task run outlasted interval by %s sec"
-
-#: cinder/openstack/common/loopingcall.py:89
-#: cinder/tests/brick/test_brick_connector.py:462
-msgid "in fixed duration looping call"
-msgstr "in fixed duration looping call"
-
-#: cinder/openstack/common/loopingcall.py:129
-#, python-format
-msgid "Dynamic looping call sleeping for %.02f seconds"
-msgstr "Dynamic looping call sleeping for %.02f seconds"
-
-#: cinder/openstack/common/loopingcall.py:136
-msgid "in dynamic looping call"
-msgstr "in dynamic looping call"
-
 #: cinder/openstack/common/periodic_task.py:40
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
@@ -3354,68 +3401,6 @@ msgid ""
 "'%(source_id)s'%(arrow)s%(target_name)s%(target_id)s"
 msgstr ""
 
-#: cinder/openstack/common/service.py:166
-#: cinder/openstack/common/service.py:384
-msgid "Full set of CONF:"
-msgstr "Full set of CONF:"
-
-#: cinder/openstack/common/service.py:175
-#: cinder/openstack/common/service.py:269
-#, python-format
-msgid "Caught %s, exiting"
-msgstr "Caught %s, exiting"
-
-#: cinder/openstack/common/service.py:187
-msgid "Exception during rpc cleanup."
-msgstr ""
-
-#: cinder/openstack/common/service.py:238
-msgid "Parent process has died unexpectedly, exiting"
-msgstr "Parent process has died unexpectedly, exiting"
-
-#: cinder/openstack/common/service.py:275
-msgid "Unhandled exception"
-msgstr "Unhandled exception"
-
-#: cinder/openstack/common/service.py:308
-msgid "Forking too fast, sleeping"
-msgstr "Forking too fast, sleeping"
-
-#: cinder/openstack/common/service.py:327
-#, python-format
-msgid "Started child %d"
-msgstr "Started child %d"
-
-#: cinder/openstack/common/service.py:337
-#, python-format
-msgid "Starting %d workers"
-msgstr "Starting %d workers"
-
-#: cinder/openstack/common/service.py:354
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr "Child %(pid)d killed by signal %(sig)d"
-
-#: cinder/openstack/common/service.py:358
-#, python-format
-msgid "Child %(pid)s exited with status %(code)d"
-msgstr "Child %(pid)s exited with status %(code)d"
-
-#: cinder/openstack/common/service.py:362
-#, python-format
-msgid "pid %d not in child list"
-msgstr "pid %d not in child list"
-
-#: cinder/openstack/common/service.py:392
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr "Caught %s, stopping children"
-
-#: cinder/openstack/common/service.py:410
-#, python-format
-msgid "Waiting on %d children to exit"
-msgstr "Waiting on %d children to exit"
-
 #: cinder/openstack/common/sslutils.py:59
 msgid ""
 "When running server in SSL mode, you must specify both a cert_file and "
@@ -3524,6 +3509,10 @@ msgstr "Must implement schedule_create_volume"
 msgid "Must implement schedule_create_consistencygroup"
 msgstr ""
 
+#: cinder/scheduler/driver.py:104
+msgid "Must implement schedule_get_pools"
+msgstr ""
+
 #: cinder/scheduler/filter_scheduler.py:119
 #, python-format
 msgid "Cannot place volume %(id)s on %(host)s"
@@ -3541,11 +3530,11 @@ msgid ""
 "not allowed"
 msgstr ""
 
-#: cinder/scheduler/filter_scheduler.py:193
+#: cinder/scheduler/filter_scheduler.py:197
 msgid "Invalid value for 'scheduler_max_attempts', must be >=1"
 msgstr "Invalid value for 'scheduler_max_attempts', must be >=1"
 
-#: cinder/scheduler/filter_scheduler.py:211
+#: cinder/scheduler/filter_scheduler.py:215
 #, python-format
 msgid ""
 "Error scheduling %(volume_id)s from last vol-service: %(last_host)s : "
@@ -3554,12 +3543,12 @@ msgstr ""
 "Error scheduling %(volume_id)s from last vol-service: %(last_host)s : "
 "%(exc)s"
 
-#: cinder/scheduler/filter_scheduler.py:244
+#: cinder/scheduler/filter_scheduler.py:248
 #, python-format
 msgid "Exceeded max scheduling attempts %(max_attempts)d for volume %(volume_id)s"
 msgstr "Exceeded max scheduling attempts %(max_attempts)d for volume %(volume_id)s"
 
-#: cinder/scheduler/filter_scheduler.py:396
+#: cinder/scheduler/filter_scheduler.py:400
 #, python-format
 msgid "No weighed hosts found for volume with properties: %s"
 msgstr ""
@@ -3582,12 +3571,12 @@ msgid ""
 "certain combination of filters and weighers."
 msgstr ""
 
-#: cinder/scheduler/manager.py:100
+#: cinder/scheduler/manager.py:100 cinder/tests/scheduler/test_scheduler.py:226
 #, python-format
 msgid "Could not find a host for consistency group %(group_id)s."
 msgstr ""
 
-#: cinder/scheduler/manager.py:108
+#: cinder/scheduler/manager.py:108 cinder/tests/scheduler/test_scheduler.py:212
 #, python-format
 msgid "Failed to create consistency group %(group_id)s."
 msgstr ""
@@ -3605,7 +3594,7 @@ msgstr ""
 msgid "Could not find a host for volume %(volume_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/scheduler/manager.py:247
+#: cinder/scheduler/manager.py:251
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "Failed to schedule_%(method)s: %(ex)s"
@@ -3624,14 +3613,12 @@ msgstr ""
 msgid "Free capacity not set: volume node info collection broken."
 msgstr "Free capacity not set: volume node info collection broken."
 
-#: cinder/scheduler/filters/capacity_filter.py:58
+#: cinder/scheduler/filters/capacity_filter.py:62
 #, python-format
 msgid ""
-"Insufficient free space for volume creation (requested / avail): "
-"%(requested)s/%(available)s"
+"Insufficient free space for volume creation on host %(host)s (requested /"
+" avail): %(requested)s/%(available)s"
 msgstr ""
-"Insufficient free space for volume creation (requested / avail): "
-"%(requested)s/%(available)s"
 
 #: cinder/scheduler/flows/create_volume.py:53
 msgid "No volume_id provided to populate a request_spec from"
@@ -3703,15 +3690,28 @@ msgstr ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 
-#: cinder/tests/test_netapp.py:1328
+#: cinder/tests/test_netapp.py:667 cinder/volume/drivers/netapp/iscsi.py:272
+#, python-format
+msgid "No iscsi target details were found for LUN %s"
+msgstr ""
+
+#: cinder/tests/test_netapp.py:673
+msgid "Expected exception message is missing"
+msgstr ""
+
+#: cinder/tests/test_netapp.py:675
+msgid "VolumeBackendAPIException not raised"
+msgstr ""
+
+#: cinder/tests/test_netapp.py:1333
 msgid "Error not a TypeError."
 msgstr ""
 
-#: cinder/tests/test_netapp.py:1337
+#: cinder/tests/test_netapp.py:1342
 msgid "Error not a KeyError."
 msgstr ""
 
-#: cinder/tests/test_netapp_nfs.py:364
+#: cinder/tests/test_netapp_nfs.py:366
 #, python-format
 msgid "Share %(share)s and file name %(file_name)s"
 msgstr ""
@@ -3725,12 +3725,12 @@ msgstr ""
 msgid "unrecognized argument %s"
 msgstr "unrecognized argument %s"
 
-#: cinder/tests/test_volume_types.py:61
+#: cinder/tests/test_volume_types.py:63
 #, python-format
 msgid "Given data: %s"
 msgstr "Given data: %s"
 
-#: cinder/tests/test_volume_types.py:62
+#: cinder/tests/test_volume_types.py:64
 #, python-format
 msgid "Result data: %s"
 msgstr "Result data: %s"
@@ -3739,6 +3739,17 @@ msgstr "Result data: %s"
 msgid "Invalid input"
 msgstr "Invalid input"
 
+#: cinder/tests/api/contrib/test_consistencygroups.py:387
+msgid ""
+"Invalid ConsistencyGroup: Consistency group status must be available or "
+"error, but current status is: invalid"
+msgstr ""
+
+#: cinder/tests/api/contrib/test_consistencygroups.py:456
+#, python-format
+msgid "volume_types must be provided to create consistency group %s."
+msgstr ""
+
 #: cinder/tests/api/middleware/test_faults.py:127
 #, python-format
 msgid "String with params: %s"
@@ -3753,6 +3764,10 @@ msgstr ""
 msgid "Value is invalid"
 msgstr ""
 
+#: cinder/tests/brick/test_brick_connector.py:462
+msgid "in fixed duration looping call"
+msgstr "in fixed duration looping call"
+
 #: cinder/tests/brick/test_brick_remotefs.py:100
 msgid "Unexpected call to _execute."
 msgstr ""
@@ -3856,57 +3871,73 @@ msgstr "Failed to update quota donating volumetransfer id %s"
 msgid "Volume %s has been transferred."
 msgstr ""
 
-#: cinder/volume/api.py:161
+#: cinder/volume/api.py:169
 msgid ""
-"Invalid volume_type provided (requested type must be supported by this "
-"consistency group."
+"Invalid volume size provided for create request (size argument must be an"
+" integer (or string represenation or an integer) and greater than zero)."
 msgstr ""
 
-#: cinder/volume/api.py:167
+#: cinder/volume/api.py:177
+msgid ""
+"volume_type must be provided when creating a volume in a consistency "
+"group."
+msgstr ""
+
+#: cinder/volume/api.py:182
+msgid ""
+"Invalid volume_type provided (requested type must be supported by this "
+"consistency group)."
+msgstr ""
+
+#: cinder/volume/api.py:188
 msgid ""
 "Invalid volume_type provided (requested type must match source volume, or"
 " be omitted). You should omit the argument."
 msgstr ""
 
-#: cinder/volume/api.py:174
+#: cinder/volume/api.py:195
 msgid ""
 "No volume_type should be provided when creating test replica, type must "
 "be omitted."
 msgstr ""
 
-#: cinder/volume/api.py:180
+#: cinder/volume/api.py:201
 msgid ""
 "Invalid volume_type provided (requested type must match source snapshot, "
 "or be omitted). You should omit the argument."
 msgstr ""
 
-#: cinder/volume/api.py:219 cinder/volume/api.py:221
+#: cinder/volume/api.py:240 cinder/volume/api.py:242
 msgid "Failed to create api volume flow"
 msgstr ""
 
-#: cinder/volume/api.py:253
+#: cinder/volume/api.py:274
 msgid "Failed to update quota for deleting volume"
 msgstr "Failed to update quota for deleting volume"
 
-#: cinder/volume/api.py:265
+#: cinder/volume/api.py:286
 #, python-format
 msgid "Volume status must be available or error, but current status is: %s"
 msgstr ""
 
-#: cinder/volume/api.py:275
+#: cinder/volume/api.py:296
 msgid "Volume cannot be deleted while migrating"
 msgstr ""
 
-#: cinder/volume/api.py:280
+#: cinder/volume/api.py:301
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr "Volume still has %d dependent snapshots"
 
-#: cinder/volume/api.py:403
+#: cinder/volume/api.py:352
+msgid "all_tenants param must be 0 or 1"
+msgstr ""
+
+#: cinder/volume/api.py:447
 msgid "Volume status must be available to reserve"
 msgstr "Volume status must be available to reserve"
 
-#: cinder/volume/api.py:422
+#: cinder/volume/api.py:466
 #, python-format
 msgid ""
 "Unable to detach volume. Volume status must be 'in-use' and attach_status"
@@ -3914,19 +3945,19 @@ msgid ""
 "attach_status: '%(attach_status)s'"
 msgstr ""
 
-#: cinder/volume/api.py:503 cinder/volume/api.py:621
+#: cinder/volume/api.py:547 cinder/volume/api.py:665
 msgid "Snapshot cannot be created while volume is migrating"
 msgstr ""
 
-#: cinder/volume/api.py:508
+#: cinder/volume/api.py:552
 msgid "Snapshot of secondary replica is not allowed."
 msgstr ""
 
-#: cinder/volume/api.py:512
+#: cinder/volume/api.py:556
 msgid "must be available"
 msgstr "must be available"
 
-#: cinder/volume/api.py:534 cinder/volume/api.py:662
+#: cinder/volume/api.py:578 cinder/volume/api.py:706
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
@@ -3935,7 +3966,7 @@ msgstr ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 
-#: cinder/volume/api.py:546 cinder/volume/api.py:674
+#: cinder/volume/api.py:590 cinder/volume/api.py:718
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
@@ -3944,141 +3975,141 @@ msgstr ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 
-#: cinder/volume/api.py:625
+#: cinder/volume/api.py:669
 #, python-format
 msgid "Snapshot cannot be created because volume '%s' is not available."
 msgstr ""
 
-#: cinder/volume/api.py:716
+#: cinder/volume/api.py:760
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume Snapshot status must be available or error"
 
-#: cinder/volume/api.py:720
+#: cinder/volume/api.py:764
 #, python-format
 msgid ""
 "Snapshot %s is part of a cgsnapshot and has to be deleted together with "
 "the cgsnapshot."
 msgstr ""
 
-#: cinder/volume/api.py:750 cinder/volume/flows/api/create_volume.py:266
+#: cinder/volume/api.py:794 cinder/volume/flows/api/create_volume.py:266
 msgid "Metadata property key blank"
 msgstr "Metadata property key blank"
 
-#: cinder/volume/api.py:754
+#: cinder/volume/api.py:798
 msgid "Metadata property key greater than 255 characters"
 msgstr "Metadata property key greater than 255 characters"
 
-#: cinder/volume/api.py:758
+#: cinder/volume/api.py:802
 msgid "Metadata property value greater than 255 characters"
 msgstr "Metadata property value greater than 255 characters"
 
-#: cinder/volume/api.py:889 cinder/volume/api.py:982
+#: cinder/volume/api.py:933 cinder/volume/api.py:1026
 msgid "Volume status must be available/in-use."
 msgstr "Volume status must be available/in-use."
 
-#: cinder/volume/api.py:892
+#: cinder/volume/api.py:936
 msgid "Volume status is in-use."
 msgstr "Volume status is in-use."
 
-#: cinder/volume/api.py:940
+#: cinder/volume/api.py:984
 msgid "Volume status must be available to extend."
 msgstr ""
 
-#: cinder/volume/api.py:945
+#: cinder/volume/api.py:989
 #, python-format
 msgid ""
 "New size for extend must be greater than current size. (current: "
 "%(size)s, extended: %(new_size)s)"
 msgstr ""
 
-#: cinder/volume/api.py:960
+#: cinder/volume/api.py:1004
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to extend volume by %(s_size)sG, "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)."
 msgstr ""
 
-#: cinder/volume/api.py:988
+#: cinder/volume/api.py:1032
 msgid "Volume is already part of an active migration"
 msgstr ""
 
-#: cinder/volume/api.py:994
+#: cinder/volume/api.py:1038
 msgid "volume must not have snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:1001 cinder/volume/manager.py:1448
+#: cinder/volume/api.py:1045 cinder/volume/manager.py:1450
 msgid "Volume must not be replicated."
 msgstr ""
 
-#: cinder/volume/api.py:1007 cinder/volume/api.py:1107
+#: cinder/volume/api.py:1051 cinder/volume/api.py:1151
 msgid "Volume must not be part of a consistency group."
 msgstr ""
 
-#: cinder/volume/api.py:1023
+#: cinder/volume/api.py:1067
 #, python-format
 msgid "No available service named %s"
 msgstr ""
 
-#: cinder/volume/api.py:1029
+#: cinder/volume/api.py:1073
 msgid "Destination host must be different than current host"
 msgstr ""
 
-#: cinder/volume/api.py:1059
+#: cinder/volume/api.py:1103
 msgid "Source volume not mid-migration."
 msgstr ""
 
-#: cinder/volume/api.py:1063
+#: cinder/volume/api.py:1107
 msgid "Destination volume not mid-migration."
 msgstr ""
 
-#: cinder/volume/api.py:1068
+#: cinder/volume/api.py:1112
 #, python-format
 msgid "Destination has migration_status %(stat)s, expected %(exp)s."
 msgstr ""
 
-#: cinder/volume/api.py:1079
+#: cinder/volume/api.py:1123
 msgid "Volume status must be available to update readonly flag."
 msgstr ""
 
-#: cinder/volume/api.py:1088
-#, python-format
-msgid "Unable to update type due to incorrect status on volume: %s"
-msgstr ""
-
-#: cinder/volume/api.py:1094
-#, python-format
-msgid "Volume %s is already part of an active migration."
-msgstr ""
-
-#: cinder/volume/api.py:1100
-#, python-format
-msgid "migration_policy must be 'on-demand' or 'never', passed: %s"
-msgstr ""
-
-#: cinder/volume/api.py:1119
-#, python-format
-msgid "Invalid volume_type passed: %s"
-msgstr ""
-
 #: cinder/volume/api.py:1132
 #, python-format
+msgid "Unable to update type due to incorrect status on volume: %s"
+msgstr ""
+
+#: cinder/volume/api.py:1138
+#, python-format
+msgid "Volume %s is already part of an active migration."
+msgstr ""
+
+#: cinder/volume/api.py:1144
+#, python-format
+msgid "migration_policy must be 'on-demand' or 'never', passed: %s"
+msgstr ""
+
+#: cinder/volume/api.py:1163
+#, python-format
+msgid "Invalid volume_type passed: %s"
+msgstr ""
+
+#: cinder/volume/api.py:1176
+#, python-format
 msgid "New volume_type same as original: %s"
 msgstr ""
 
-#: cinder/volume/api.py:1147
+#: cinder/volume/api.py:1191
 msgid "Retype cannot change encryption requirements"
 msgstr ""
 
-#: cinder/volume/api.py:1159
+#: cinder/volume/api.py:1203
 msgid "Retype cannot change front-end qos specs for in-use volumes"
 msgstr ""
 
-#: cinder/volume/api.py:1192
+#: cinder/volume/api.py:1236
 msgid "Unable to find service for given host."
 msgstr ""
 
 #: cinder/volume/driver.py:231 cinder/volume/drivers/hds/nfs.py:352
-#: cinder/volume/drivers/netapp/nfs.py:177
+#: cinder/volume/drivers/netapp/nfs.py:186
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "Recovering from a failed execute.  Try number %s"
@@ -4144,22 +4175,20 @@ msgstr ""
 
 #: cinder/volume/driver.py:854
 #: cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py:150
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:155
-#: cinder/volume/targets/iscsi.py:130
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr "ISCSI provider_location not stored, using discovery"
 
-#: cinder/volume/driver.py:867 cinder/volume/targets/iscsi.py:143
+#: cinder/volume/driver.py:867
 #, python-format
 msgid "ISCSI discovery attempt failed for:%s"
 msgstr ""
 
-#: cinder/volume/driver.py:916 cinder/volume/targets/iscsi.py:78
+#: cinder/volume/driver.py:916
 #, python-format
 msgid "Could not find iSCSI export for volume %s"
 msgstr "Could not find iSCSI export for volume %s"
 
-#: cinder/volume/driver.py:1018 cinder/volume/targets/iscsi.py:185
+#: cinder/volume/driver.py:1018
 msgid "The volume driver requires the iSCSI initiator name in the connector."
 msgstr ""
 
@@ -4175,13 +4204,12 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/iscsi.py:69 cinder/volume/iscsi.py:95
-#: cinder/volume/iscsi.py:240 cinder/volume/targets/lio.py:39
-#: cinder/volume/targets/tgt.py:275
+#: cinder/volume/iscsi.py:240
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s"
 msgstr "Skipping remove_export. No iscsi_target provisioned for volume: %s"
 
-#: cinder/volume/iscsi.py:84 cinder/volume/targets/tgt.py:290
+#: cinder/volume/iscsi.py:84
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
@@ -4194,7 +4222,7 @@ msgstr ""
 msgid "Detected inconsistency in provider_location id"
 msgstr "Detected inconsistency in provider_location id"
 
-#: cinder/volume/iscsi.py:258 cinder/volume/targets/lio.py:58
+#: cinder/volume/iscsi.py:258
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provision for volume: %s"
 msgstr "Skipping ensure_export. No iscsi_target provision for volume: %s"
@@ -4287,7 +4315,7 @@ msgstr "volume %s: deleted successfully"
 msgid "snapshot %s: creating"
 msgstr "snapshot %s: creating"
 
-#: cinder/volume/manager.py:543 cinder/volume/manager.py:1828
+#: cinder/volume/manager.py:543 cinder/volume/manager.py:1834
 #, python-format
 msgid ""
 "Failed updating %(snapshot_id)s metadata using the provided volumes "
@@ -4309,7 +4337,7 @@ msgstr "snapshot %s: deleting"
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:618 cinder/volume/manager.py:1928
+#: cinder/volume/manager.py:618 cinder/volume/manager.py:1934
 msgid "Failed to update usages deleting snapshot"
 msgstr "Failed to update usages deleting snapshot"
 
@@ -4361,212 +4389,212 @@ msgid ""
 "%(model)s during xfr."
 msgstr ""
 
-#: cinder/volume/manager.py:1016
+#: cinder/volume/manager.py:1018
 msgid "failed to create new_volume on destination host"
 msgstr ""
 
-#: cinder/volume/manager.py:1019
+#: cinder/volume/manager.py:1021
 msgid "timeout creating new_volume on destination host"
 msgstr ""
 
-#: cinder/volume/manager.py:1042
+#: cinder/volume/manager.py:1044
 #, python-format
 msgid "Failed to copy volume %(vol1)s to %(vol2)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1071
+#: cinder/volume/manager.py:1073
 #, python-format
 msgid ""
 "migrate_volume_completion: completing migration for volume %(vol1)s "
 "(temporary volume %(vol2)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1083
+#: cinder/volume/manager.py:1085
 #, python-format
 msgid ""
 "migrate_volume_completion is cleaning up an error for volume %(vol1)s "
 "(temporary volume %(vol2)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1104
+#: cinder/volume/manager.py:1106
 #, python-format
 msgid "Failed to delete migration source vol %(vol)s: %(err)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1190
+#: cinder/volume/manager.py:1192
 msgid "Updating volume status"
 msgstr "Updating volume status"
 
-#: cinder/volume/manager.py:1198
+#: cinder/volume/manager.py:1200
 #, python-format
 msgid ""
 "Unable to update stats, %(driver_name)s -%(driver_version)s "
 "%(config_group)s driver is uninitialized."
 msgstr ""
 
-#: cinder/volume/manager.py:1234
+#: cinder/volume/manager.py:1236
 #, python-format
 msgid "Notification {%s} received"
 msgstr "Notification {%s} received"
 
-#: cinder/volume/manager.py:1302
+#: cinder/volume/manager.py:1304
 #, python-format
 msgid "volume %s: extending"
 msgstr ""
 
-#: cinder/volume/manager.py:1304
+#: cinder/volume/manager.py:1306
 #, python-format
 msgid "volume %s: extended successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1306
+#: cinder/volume/manager.py:1308
 #, python-format
 msgid "volume %s: Error trying to extend volume"
 msgstr ""
 
-#: cinder/volume/manager.py:1311
+#: cinder/volume/manager.py:1313
 #, python-format
 msgid "Volume %s: Error trying to extend volume"
 msgstr ""
 
-#: cinder/volume/manager.py:1385
+#: cinder/volume/manager.py:1387
 msgid "Failed to update usages while retyping volume."
 msgstr ""
 
-#: cinder/volume/manager.py:1386
+#: cinder/volume/manager.py:1388
 msgid "Failed to get old volume type quota reservations"
 msgstr ""
 
-#: cinder/volume/manager.py:1417
+#: cinder/volume/manager.py:1419
 #, python-format
 msgid "Volume %s: retyped successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1420
+#: cinder/volume/manager.py:1422
 #, python-format
 msgid ""
 "Volume %s: driver error when trying to retype, falling back to generic "
 "mechanism."
 msgstr ""
 
-#: cinder/volume/manager.py:1431
+#: cinder/volume/manager.py:1433
 msgid "Retype requires migration but is not allowed."
 msgstr ""
 
-#: cinder/volume/manager.py:1439
+#: cinder/volume/manager.py:1441
 msgid "Volume must not have snapshots."
 msgstr ""
 
-#: cinder/volume/manager.py:1487
+#: cinder/volume/manager.py:1489
 msgid "Failed to create manage_existing flow."
 msgstr ""
 
-#: cinder/volume/manager.py:1489
+#: cinder/volume/manager.py:1491
 msgid "Failed to create manage existing flow."
 msgstr ""
 
-#: cinder/volume/manager.py:1519
+#: cinder/volume/manager.py:1521
 #, python-format
 msgid "Failed to promote replica for volume %(id)s."
 msgstr ""
 
-#: cinder/volume/manager.py:1528
+#: cinder/volume/manager.py:1530
 msgid "Error promoting secondary volume to primary"
 msgstr ""
 
-#: cinder/volume/manager.py:1538 cinder/volume/manager.py:1569
+#: cinder/volume/manager.py:1540 cinder/volume/manager.py:1571
 #, python-format
 msgid "Failed updating model with driver provided model %(model)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1550
+#: cinder/volume/manager.py:1552
 #, python-format
 msgid "Failed to sync replica for volume %(id)s."
 msgstr ""
 
-#: cinder/volume/manager.py:1559
+#: cinder/volume/manager.py:1561
 msgid "Error synchronizing secondary volume to primary"
 msgstr ""
 
-#: cinder/volume/manager.py:1577
+#: cinder/volume/manager.py:1579
 msgid "Updating volume replication status."
 msgstr ""
 
-#: cinder/volume/manager.py:1585
+#: cinder/volume/manager.py:1587
 #, python-format
 msgid ""
 "Unable to update volume replication status, %(driver_name)s "
 "-%(driver_version)s %(config_group)s driver is uninitialized."
 msgstr ""
 
-#: cinder/volume/manager.py:1603
+#: cinder/volume/manager.py:1605
 #, python-format
 msgid "Error checking replication status for volume %s"
 msgstr ""
 
-#: cinder/volume/manager.py:1621
+#: cinder/volume/manager.py:1623
 #, python-format
 msgid "Consistency group %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:1635
+#: cinder/volume/manager.py:1637
 #, python-format
 msgid "Consistency group %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:1643
+#: cinder/volume/manager.py:1645
 #, python-format
 msgid "Consistency group %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1662
+#: cinder/volume/manager.py:1664
 #, python-format
 msgid "Consistency group %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:1672
+#: cinder/volume/manager.py:1678
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:1700
+#: cinder/volume/manager.py:1706
 #, python-format
 msgid "Error occurred when deleting consistency group %s."
 msgstr ""
 
-#: cinder/volume/manager.py:1723
+#: cinder/volume/manager.py:1729
 msgid "Failed to update usages deleting consistency groups."
 msgstr ""
 
-#: cinder/volume/manager.py:1740
+#: cinder/volume/manager.py:1746
 msgid "Failed to update usages deleting volume."
 msgstr ""
 
-#: cinder/volume/manager.py:1758
+#: cinder/volume/manager.py:1764
 #, python-format
 msgid "Consistency group %s: deleted successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:1771
+#: cinder/volume/manager.py:1777
 #, python-format
 msgid "Cgsnapshot %s: creating."
 msgstr ""
 
-#: cinder/volume/manager.py:1846
+#: cinder/volume/manager.py:1852
 #, python-format
 msgid "cgsnapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1859
+#: cinder/volume/manager.py:1865
 #, python-format
 msgid "cgsnapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:1894
+#: cinder/volume/manager.py:1900
 #, python-format
 msgid "Error occurred when deleting cgsnapshot %s."
 msgstr ""
 
-#: cinder/volume/manager.py:1939
+#: cinder/volume/manager.py:1945
 #, python-format
 msgid "cgsnapshot %s: deleted successfully"
 msgstr ""
@@ -4707,36 +4735,43 @@ msgstr ""
 msgid "Error message is empty."
 msgstr ""
 
-#: cinder/volume/drivers/coraid.py:386
+#: cinder/volume/drivers/coraid.py:391
 msgid "Cannot create clone volume in different repository."
 msgstr ""
 
 #: cinder/volume/drivers/datera.py:88
 #, python-format
 msgid ""
-"Tried to delete volume %s, but was not found in Datera cluster. "
+"Tried to delete volume %s, but it was not found in the Datera cluster. "
 "Continuing with delete."
 msgstr ""
 
-#: cinder/volume/drivers/datera.py:121
+#: cinder/volume/drivers/datera.py:122
+#, python-format
+msgid ""
+"Tried to delete export for volume %s, but it was not found in the Datera "
+"cluster. Continuing with volume detach"
+msgstr ""
+
+#: cinder/volume/drivers/datera.py:131
 #, python-format
 msgid ""
 "Tried to delete snapshot %s, but was not found in Datera cluster. "
 "Continuing with delete."
 msgstr ""
 
-#: cinder/volume/drivers/datera.py:171
+#: cinder/volume/drivers/datera.py:181
 msgid "Failed to get updated stats from Datera Cluster."
 msgstr ""
 
-#: cinder/volume/drivers/datera.py:234
+#: cinder/volume/drivers/datera.py:244
 #, python-format
 msgid ""
 "Failed to make a request to Datera cluster endpoint due to the following "
 "reason: %s"
 msgstr ""
 
-#: cinder/volume/drivers/datera.py:245
+#: cinder/volume/drivers/datera.py:255
 #, python-format
 msgid "Request to Datera cluster returned bad status: %(status)s | %(reason)s"
 msgstr ""
@@ -4921,7 +4956,7 @@ msgid "Delete Volume: %(volume)s"
 msgstr "Delete Volume: %(volume)s"
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:519
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1998
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1989
 #, python-format
 msgid "Volume %(name)s not found on the array. No volume to delete."
 msgstr "Volume %(name)s not found on the array. No volume to delete."
@@ -4945,7 +4980,7 @@ msgstr ""
 "%(error)s"
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:577
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1705
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1863
 #, python-format
 msgid "Create snapshot: %(snapshot)s: volume: %(volume)s"
 msgstr "Create snapshot: %(snapshot)s: volume: %(volume)s"
@@ -5050,7 +5085,7 @@ msgid "Volume %s is not mapped. No volume to unmap."
 msgstr "Volume %s is not mapped. No volume to unmap."
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:978
-#: cinder/volume/drivers/emc/emc_vmax_common.py:354
+#: cinder/volume/drivers/emc/emc_vmax_common.py:352
 #, python-format
 msgid "Initialize connection: %(volume)s"
 msgstr "Initialize connection: %(volume)s"
@@ -5061,7 +5096,7 @@ msgid "Volume %s is already mapped."
 msgstr "Volume %s is already mapped."
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:996
-#: cinder/volume/drivers/emc/emc_vmax_common.py:421
+#: cinder/volume/drivers/emc/emc_vmax_common.py:412
 #, python-format
 msgid "Terminate connection: %(volume)s"
 msgstr "Terminate connection: %(volume)s"
@@ -5094,7 +5129,7 @@ msgid "Snap pool not found."
 msgstr ""
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1219
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1190
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1181
 msgid "Cannot connect to ECOM server"
 msgstr "Cannot connect to ECOM server"
 
@@ -5116,7 +5151,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1397
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1347
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1338
 #: cinder/volume/drivers/emc/emc_vmax_masking.py:448
 #, python-format
 msgid "Error finding %s."
@@ -5130,11 +5165,11 @@ msgstr ""
 
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1427
 #: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1491
-#: cinder/volume/drivers/emc/emc_vmax_common.py:984
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1042
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1430
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1737
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2069
+#: cinder/volume/drivers/emc/emc_vmax_common.py:975
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1033
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1421
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1728
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2060
 #: cinder/volume/drivers/emc/emc_vmax_fast.py:512
 #: cinder/volume/drivers/emc/emc_vmax_fast.py:654
 #: cinder/volume/drivers/emc/emc_vmax_masking.py:208
@@ -5325,138 +5360,83 @@ msgstr ""
 msgid "Failed to refresh mounts, reason=%s"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:184
-#, python-format
-msgid "Cloning volume %(src)s to volume %(dst)s"
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:189
-msgid "Volume status must be 'available'."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:225 cinder/volume/drivers/remotefs.py:115
-#: cinder/volume/drivers/netapp/nfs.py:788
+#: cinder/volume/drivers/glusterfs.py:179 cinder/volume/drivers/remotefs.py:115
+#: cinder/volume/drivers/netapp/nfs.py:817
 #, python-format
 msgid "casted to %s"
 msgstr "casted to %s"
 
-#: cinder/volume/drivers/glusterfs.py:239
-msgid "Snapshot status must be \"available\" to clone."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:298 cinder/volume/drivers/remotefs.py:165
+#: cinder/volume/drivers/glusterfs.py:233 cinder/volume/drivers/remotefs.py:167
 #, python-format
 msgid "Volume %s does not have provider_location specified, skipping"
 msgstr "Volume %s does not have provider_location specified, skipping"
 
-#: cinder/volume/drivers/glusterfs.py:406
-#, python-format
-msgid "Volume status must be \"available\" or \"in-use\" for snapshot. (is %s)"
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:438
-msgid "Call to Nova to create snapshot failed"
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:460
-msgid "Nova returned \"error\" status while creating snapshot."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:477
-#, python-format
-msgid "Timed out while waiting for Nova update for creation of snapshot %s."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:575
-msgid "Volume status must be \"available\" or \"in-use\"."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:591
-#, python-format
-msgid ""
-"Snapshot record for %s is not present, allowing snapshot_delete to "
-"proceed."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:617
-#, python-format
-msgid "No backing file found for %s, allowing snapshot to be deleted."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:694
-#, python-format
-msgid "No file found with %s as backing file."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:704
-#, python-format
-msgid "No snap found with %s as backing file."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:741
-#, python-format
-msgid "Check condition failed: %s expected to be None."
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:792
+#: cinder/volume/drivers/glusterfs.py:312
 msgid "Call to Nova delete snapshot failed"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:816
+#: cinder/volume/drivers/glusterfs.py:336
 #, python-format
 msgid "Unable to delete snapshot %(id)s, status: %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:829
+#: cinder/volume/drivers/glusterfs.py:349
 #, python-format
 msgid "Timed out while waiting for Nova update for deletion of snapshot %(id)s."
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:854
-#, python-format
-msgid "Deleting stale snapshot: %s"
-msgstr ""
-
-#: cinder/volume/drivers/glusterfs.py:895
+#: cinder/volume/drivers/glusterfs.py:398
 #, python-format
 msgid "%s must be a valid raw or qcow2 image."
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:953
+#: cinder/volume/drivers/glusterfs.py:424 cinder/volume/drivers/smbfs.py:442
 msgid "Extend volume is only supported for this driver when no snapshots exist."
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:961
+#: cinder/volume/drivers/glusterfs.py:432
 #, python-format
 msgid "Unrecognized backing format: %s"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:979
+#: cinder/volume/drivers/glusterfs.py:450
 #, python-format
 msgid "file already exists at %s"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:1005
-#: cinder/volume/drivers/remotefs.py:152
+#: cinder/volume/drivers/glusterfs.py:476 cinder/volume/drivers/remotefs.py:152
 #, python-format
 msgid "Exception during mounting %s"
 msgstr "Exception during mounting %s"
 
-#: cinder/volume/drivers/glusterfs.py:1077
+#: cinder/volume/drivers/glusterfs.py:548
 msgid "Backup is not supported for GlusterFS volumes with snapshots."
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:1092
+#: cinder/volume/drivers/glusterfs.py:563
 #, python-format
 msgid ""
 "No snapshots found in database, but %(path)s has backing file "
 "%(backing_file)s!"
 msgstr ""
 
-#: cinder/volume/drivers/glusterfs.py:1100
+#: cinder/volume/drivers/glusterfs.py:571
 msgid "Backup is only supported for raw-formatted GlusterFS volumes."
 msgstr ""
 
+#: cinder/volume/drivers/glusterfs.py:600
+msgid "Call to Nova to create snapshot failed"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:622
+msgid "Nova returned \"error\" status while creating snapshot."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:639
+#, python-format
+msgid "Timed out while waiting for Nova update for creation of snapshot %s."
+msgstr ""
+
 #: cinder/volume/drivers/lvm.py:153
 #, python-format
 msgid "Volume device file path %s does not exist."
@@ -5488,7 +5468,7 @@ msgid "Failed to rename logical volume %(name)s, error message was: %(err_msg)s"
 msgstr ""
 
 #: cinder/volume/drivers/lvm.py:436 cinder/volume/drivers/rbd.py:907
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:384
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:403
 msgid "Reference must contain source-name element."
 msgstr ""
 
@@ -5529,12 +5509,13 @@ msgstr ""
 msgid "NFS config 'nfs_used_ratio' invalid.  Must be > 0 and <= 1.0: %s"
 msgstr ""
 
-#: cinder/volume/drivers/nfs.py:249 cinder/volume/drivers/netapp/nfs.py:612
+#: cinder/volume/drivers/nfs.py:249 cinder/volume/drivers/smbfs.py:403
+#: cinder/volume/drivers/netapp/nfs.py:620
 #, python-format
 msgid "Extending volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/nfs.py:257
+#: cinder/volume/drivers/nfs.py:257 cinder/volume/drivers/smbfs.py:410
 #, python-format
 msgid "Resizing file to %sG..."
 msgstr ""
@@ -5548,7 +5529,7 @@ msgid "Unexpected response from Nimble API"
 msgstr ""
 
 #: cinder/volume/drivers/nimble.py:90
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:88
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:90
 #, python-format
 msgid "%s is not set."
 msgstr ""
@@ -5877,37 +5858,91 @@ msgstr "Not an rbd snapshot"
 msgid "Failed to Extend Volume %(volname)s"
 msgstr ""
 
-#: cinder/volume/drivers/remotefs.py:256
+#: cinder/volume/drivers/remotefs.py:267 cinder/volume/drivers/smbfs.py:522
 #, python-format
 msgid "Expected volume size was %d"
 msgstr ""
 
-#: cinder/volume/drivers/remotefs.py:257
+#: cinder/volume/drivers/remotefs.py:268
 #, python-format
 msgid " but size is now %d"
 msgstr ""
 
-#: cinder/volume/drivers/remotefs.py:293
+#: cinder/volume/drivers/remotefs.py:304
 #, python-format
 msgid "Share %s ignored due to invalid format.  Must be of form address:/export."
 msgstr ""
 
-#: cinder/volume/drivers/remotefs.py:354
+#: cinder/volume/drivers/remotefs.py:365
 #, python-format
 msgid "%s is already mounted"
 msgstr "%s is already mounted"
 
-#: cinder/volume/drivers/remotefs.py:404
+#: cinder/volume/drivers/remotefs.py:422
 msgid "'active' must be present when writing snap_info."
 msgstr ""
 
-#: cinder/volume/drivers/remotefs.py:525
+#: cinder/volume/drivers/remotefs.py:548
 #, python-format
 msgid ""
 "Share at %(dir)s is not writable by the Cinder volume service. Snapshot "
 "operations will not be supported."
 msgstr ""
 
+#: cinder/volume/drivers/remotefs.py:601
+#, python-format
+msgid "Cloning volume %(src)s to volume %(dst)s"
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:606
+msgid "Volume status must be 'available'."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:645
+#, python-format
+msgid "Deleting stale snapshot: %s"
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:669
+msgid "Volume status must be \"available\" or \"in-use\"."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:685
+#, python-format
+msgid ""
+"Snapshot record for %s is not present, allowing snapshot_delete to "
+"proceed."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:711
+#, python-format
+msgid "No backing file found for %s, allowing snapshot to be deleted."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:782
+#, python-format
+msgid "No file found with %s as backing file."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:791
+#, python-format
+msgid "No snap found with %s as backing file."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:820
+#, python-format
+msgid "Check condition failed: %s expected to be None."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:835
+msgid "Snapshot status must be \"available\" to clone."
+msgstr ""
+
+#: cinder/volume/drivers/remotefs.py:964
+#, python-format
+msgid "Volume status must be \"available\" or \"in-use\" for snapshot. (is %s)"
+msgstr ""
+
 #: cinder/volume/drivers/scality.py:68
 msgid "Value required for 'scality_sofs_config'"
 msgstr "Value required for 'scality_sofs_config'"
@@ -5939,6 +5974,74 @@ msgstr "Sheepdog is not working: %s"
 msgid "Sheepdog is not working"
 msgstr "Sheepdog is not working"
 
+#: cinder/volume/drivers/smbfs.py:131
+msgid "SMBFS config file not set (smbfs_shares_config)."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:135
+#, python-format
+msgid "SMBFS config file at %(config)s doesn't exist."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:140
+#, python-format
+msgid "Invalid mount point base: %s"
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:144
+#, python-format
+msgid "SMBFS config 'smbfs_oversub_ratio' invalid.  Must be > 0: %s"
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:153
+#, python-format
+msgid "SMBFS config 'smbfs_used_ratio' invalid.  Must be > 0 and <= 1.0: %s"
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:204 cinder/volume/drivers/ibm/ibmnas.py:287
+#, python-format
+msgid "Volume %s does not have provider_location specified, skipping."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:226
+msgid "qemu-img is not installed."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:238
+msgid ""
+"This version of qemu-img does not support vhdx images. Please upgrade to "
+"1.7 or greater."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:258
+#, python-format
+msgid "File already exists at %s."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:375
+msgid "This driver does not support snapshotting in-use volumes."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:379
+msgid "This driver does not support deleting in-use snapshots."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:391
+#, python-format
+msgid "Snapshots are not supported for this volume format: %s"
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:505
+msgid ""
+"Unsupported volume format: vhdx. qemu-img 1.7 or higher is required in "
+"order to properly support this format."
+msgstr ""
+
+#: cinder/volume/drivers/smbfs.py:523
+#, python-format
+msgid " but size is now %d."
+msgstr ""
+
 #: cinder/volume/drivers/solidfire.py:153
 #, python-format
 msgid ""
@@ -6137,7 +6240,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/emc/emc_vmax_common.py:179
-#: cinder/volume/drivers/emc/emc_vmax_common.py:903
+#: cinder/volume/drivers/emc/emc_vmax_common.py:894
 #, python-format
 msgid ""
 "Adding volume: %(volumeName)s to default storage group for FAST policy: "
@@ -6145,8 +6248,8 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/emc/emc_vmax_common.py:188
-#: cinder/volume/drivers/emc/emc_vmax_common.py:917
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1961
+#: cinder/volume/drivers/emc/emc_vmax_common.py:908
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1952
 #, python-format
 msgid ""
 "Unable to create or get default storage group for FAST policy: "
@@ -6182,90 +6285,85 @@ msgid ""
 "%(storage_system)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:362
+#: cinder/volume/drivers/emc/emc_vmax_common.py:360
 #, python-format
 msgid ""
 "Volume %(volume)s is already mapped. The device number is  "
 "%(deviceNumber)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:377
+#: cinder/volume/drivers/emc/emc_vmax_common.py:375
 #, python-format
 msgid "Error Attaching volume %(vol)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:397
-#, python-format
-msgid "Unable to get iscsi IP address for storagesystem %(storageSystem)s"
-msgstr ""
-
-#: cinder/volume/drivers/emc/emc_vmax_common.py:445
+#: cinder/volume/drivers/emc/emc_vmax_common.py:436
 #, python-format
 msgid "Cannot find Volume: %(volumename)s. Extend operation.  Exiting...."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:452
+#: cinder/volume/drivers/emc/emc_vmax_common.py:443
 #, python-format
 msgid ""
 "Your original size: %(originalVolumeSize)s GB is greater than: "
 "%(newSize)s GB. Only Extend is supported. Exiting..."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:469
+#: cinder/volume/drivers/emc/emc_vmax_common.py:460
 #, python-format
 msgid ""
 "Volume: %(volumeName)s is not a concatenated volume. You can only perform"
 " extend on concatenated volume. Exiting..."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:504
+#: cinder/volume/drivers/emc/emc_vmax_common.py:495
 msgid "Error Creating unbound volume on an Extend operation"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:515
+#: cinder/volume/drivers/emc/emc_vmax_common.py:506
 #, python-format
 msgid ""
 "On an Extend Operation, error adding volume to composite volume: "
 "%(volumename)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:539
+#: cinder/volume/drivers/emc/emc_vmax_common.py:530
 #, python-format
 msgid ""
 "The requested size : %(requestedSize)s is not the same as resulting size:"
 " %(resultSize)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:575
+#: cinder/volume/drivers/emc/emc_vmax_common.py:566
 #, python-format
 msgid "PoolName %(poolName)s must be in the file %(emcConfigFileName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:582
+#: cinder/volume/drivers/emc/emc_vmax_common.py:573
 #, python-format
 msgid ""
 "Array Serial Number %(arrayName)s must be in the file "
 "%(emcConfigFileName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:677
+#: cinder/volume/drivers/emc/emc_vmax_common.py:668
 #, python-format
 msgid "Migrating using retype Volume: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:685
+#: cinder/volume/drivers/emc/emc_vmax_common.py:676
 #, python-format
 msgid "Volume %(name)s not found on the array. No volume to migrate using retype."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:697
+#: cinder/volume/drivers/emc/emc_vmax_common.py:688
 #, python-format
 msgid ""
 "Volume %(name)s is not suitable for storage assisted migration using "
 "retype"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:725
+#: cinder/volume/drivers/emc/emc_vmax_common.py:716
 msgid ""
 "The VMAX plugin only supports Retype.  If a pool based migration is "
 "necessary this will happen on a Retype From the command line: cinder "
@@ -6273,155 +6371,155 @@ msgid ""
 "policy on-demand"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:759
+#: cinder/volume/drivers/emc/emc_vmax_common.py:750
 #, python-format
 msgid ""
 "Failed to migrate: %(volumeName)s from default source storage group for "
 "FAST policy: %(sourceFastPolicyName)s Attempting cleanup... "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:785
+#: cinder/volume/drivers/emc/emc_vmax_common.py:776
 #, python-format
 msgid ""
 "Attempting a rollback of: %(volumeName)s to original pool "
 "%(sourcePoolInstanceName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:816
+#: cinder/volume/drivers/emc/emc_vmax_common.py:807
 #, python-format
 msgid "_migrate_rollback on : %(volumeName)s from "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:827
+#: cinder/volume/drivers/emc/emc_vmax_common.py:818
 #, python-format
 msgid ""
 "Failed to return volume %(volumeName)s to original storage pool. Please "
 "contact your system administrator to return it to the correct location "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:854
+#: cinder/volume/drivers/emc/emc_vmax_common.py:845
 #, python-format
 msgid "_migrate_cleanup on : %(volumeName)s from "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:930
+#: cinder/volume/drivers/emc/emc_vmax_common.py:921
 #, python-format
 msgid ""
 "Failed to verify that volume was added to storage group for FAST policy: "
 "%(fastPolicyName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:971
+#: cinder/volume/drivers/emc/emc_vmax_common.py:962
 #, python-format
 msgid "Error finding targe pool instance name for pool: %(targetPoolName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:985
+#: cinder/volume/drivers/emc/emc_vmax_common.py:976
 #, python-format
 msgid ""
 "Error migrating volume: %(volumename)s. to target pool  "
 "%(targetPoolName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1000
+#: cinder/volume/drivers/emc/emc_vmax_common.py:991
 #, python-format
 msgid ""
 "Volume : %(volumeName)s. was not successfully migrated to target pool "
 "%(targetPoolName)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1043
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1034
 #, python-format
 msgid ""
 "Failed to remove: %(volumename)s. from the default storage group for FAST"
 " policy %(fastPolicyName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1053
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2020
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1044
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2011
 #, python-format
 msgid ""
 "The volume: %(volumename)s. was not first part of the default storage "
 "group for FAST policy %(fastPolicyName)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1083
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1074
 #, python-format
 msgid ""
 "Failed to add %(volumeName)s to default storage group for fast policy "
 "%(fastPolicyName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1108
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1099
 msgid "Error getting target pool name and array"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1120
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1111
 msgid "Error parsing target pool name, array, and fast policy"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1124
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1115
 #, python-format
 msgid ""
 "The source array : %(sourceArraySerialNumber)s does not match the target "
 "array: %(targetArraySerialNumber)sskipping storage-assisted migration"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1140
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1131
 #, python-format
 msgid ""
 "No action required. Volume : %(volumeName)s is already part of pool : "
 "%(pool)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1150
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1141
 msgid "Only available volumes can be migrated between different protocols"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1211
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1202
 #, python-format
 msgid "StorageSystem %(array)s is not found."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1248
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1239
 #, python-format
 msgid "Pool %(poolNameInStr)s is not found."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1254
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1245
 #, python-format
 msgid "Storage system not found for pool %(poolNameInStr)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1431
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1422
 #, python-format
 msgid "Unable to get target endpoints for hardwareId %(hardwareIdInstance)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1449
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1440
 #, python-format
 msgid "Target end points do not exist for hardware Id : %(hardwareIdInstance)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1525
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1516
 #, python-format
 msgid "Configuration file %(configurationFile)s does not exist "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1574
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1565
 msgid ""
 "The pool cannot be null. The pool must be configured either in the extra "
 "specs or in the EMC configuration file corresponding to the Volume Type. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1585
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1576
 msgid ""
 "The array cannot be null. The pool must be configured either as a cinder "
 "extra spec for multi-backend or in the EMC configuration file for the "
 "default case "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1617
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1608
 msgid ""
 "Unable to get configuration information necessary to create a volume. "
 "Please check that there is a configuration file for each config group, if"
@@ -6429,39 +6527,39 @@ msgid ""
 "/etc/cinder/cinder_emc_config_<CONFIG_GROUP>.xml"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1640
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1631
 msgid "You must supply an array in your EMC configuration file "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1646
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1637
 msgid "Cannot get necessary pool or storage system information "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1726
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1717
 #, python-format
 msgid ""
 "Error adding Volume: %(volumeName)s.  with instance path: "
 "%(volumeInstancePath)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1738
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1729
 #, python-format
 msgid "Rolling back %(volumeName)s by deleting it. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1844
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1835
 #, python-format
 msgid "Unable to determine whether %(volumeName)s is composite or not "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1893
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1884
 #, python-format
 msgid ""
 "Create a Clone from Volume: Clone Volume: %(cloneName)s  Source Volume: "
 "%(sourceName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2060
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2051
 #, python-format
 msgid ""
 "Failed to Roll back to re-add volume %(volumeName)s to default storage "
@@ -6469,12 +6567,12 @@ msgid ""
 " get the volume returned to the default storage group"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2070
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2061
 #, python-format
 msgid "Failed to delete volume %(volumeName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2092
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2083
 #, python-format
 msgid ""
 "Pre check for deletion Volume: %(volumeName)s is part of a storage group "
@@ -6571,47 +6669,55 @@ msgstr ""
 msgid "Storage group not associated with the policy %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:147
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:53
+msgid "iscsi_ip_address is not set."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:148
 #, python-format
 msgid "Leaving initialize_connection: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:162
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:156
+msgid "ISCSI provider_location not stored, using discovery."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:163
 #, python-format
 msgid "smis_do_iscsi_discovery is: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:191
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:192
 #, python-format
 msgid "Could not find iSCSI export  for volume %(volumeName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:201
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:202
 #, python-format
 msgid "Cannot find device number for volume %(volumeName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:208
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:209
 #, python-format
 msgid "location is: %(location)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:220
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:221
 #, python-format
 msgid "ISCSI properties: %(properties)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:222
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:223
 #, python-format
 msgid "ISCSI volume is: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:227
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:228
 #, python-format
 msgid "AUTH properties: %(authProps)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:237
+#: cinder/volume/drivers/emc/emc_vmax_iscsi.py:238
 #, python-format
 msgid "AUTH properties: %s"
 msgstr ""
@@ -6961,7 +7067,7 @@ msgstr ""
 msgid "Cannot get storage system"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:638
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:622
 msgid "Port Group name not found."
 msgstr ""
 
@@ -6969,343 +7075,423 @@ msgstr ""
 msgid "Fast Policy not found."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:199
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:203
 #, python-format
 msgid "naviseccli_path: Could not find NAVISECCLI tool %(path)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:209
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:213
 msgid "san_secondary_ip is configured as the same value as san_ip."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:213
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:217
 msgid "san_ip: Mandatory field configuration. san_ip is not set."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:227
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:231
 #, python-format
 msgid "Invalid VNX authentication type: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:234
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:238
 #, python-format
 msgid "Using security file in %s for authentication"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:242
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:246
 msgid "Plain text credentials are being used for authentication"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:245
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:249
 msgid ""
 "Neither security file nor plain text credentials are specified. Security "
 "file under home directory will be used for authentication if present."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:254
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:258
 #, python-format
 msgid "iscsi_initiators: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:308
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:313
 #, python-format
-msgid "Failed to enable compression on lun: %s"
+msgid "Error on enable compression on lun %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:317
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:324
+#, python-format
+msgid "Error on adding lun to consistency group. %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:334
 #, python-format
 msgid "LUN already exists, LUN name %(name)s. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:345
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:362
 #, python-format
 msgid "LUN is already deleted, LUN name %(name)s. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:371
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:388
 #, python-format
 msgid "CommandLineHelper._wait_for_condition: %s timeout"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:392
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:409
 #, python-format
 msgid "LUN %(name)s is already expanded. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:450
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:466
+#, python-format
+msgid "Consistency group %(name)s already exists. Message: %(msg)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:505
+#, python-format
+msgid "Can not add the lun %(lun)s to consistency group %(cg_name)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:535
+#, python-format
+msgid "CG %(cg_name)s does not exist. Message: %(msg)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:539
+#, python-format
+msgid "CG %(cg_name)s is deleting. Message: %(msg)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:545
+#, python-format
+msgid "Consistency group %s was deleted successfully."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:565
+#, python-format
+msgid "Cgsnapshot name %(name)s already exists. Message: %(msg)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:583
+#, python-format
+msgid "Snapshot %(name)s for consistency group does not exist. Message: %(msg)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:604
 #, python-format
 msgid "Snapshot %(name)s already exists. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:456
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:610
 #, python-format
-msgid "Failed to get LUN ID for volume %s"
+msgid "Failed to get LUN ID for volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:470
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:624
 #, python-format
 msgid "Snapshot %(name)s may deleted already. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:477
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:631
 #, python-format
 msgid "Snapshot %(name)s is in use, retry. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:484
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:638
 #, python-format
 msgid "Snapshot %s was deleted successfully."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:504
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:658
 #, python-format
 msgid "Mount point %(name)s already exists. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:523
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:677
 #, python-format
 msgid ""
 "Snapshot %(snapname)s is attached to snapshot mount point %(mpname)s "
 "already. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:577
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:731
 #, python-format
 msgid ""
 "Migration command may get network timeout. Double check whether migration"
 " in fact started successfully. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:588
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:742
 #, python-format
 msgid "Start migration failed. Message: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:614
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:768
 msgid "Querying migrating status error."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:671
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:825
 #, python-format
 msgid "Storage group %(name)s already exists. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:688
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:842
 #, python-format
 msgid ""
 "Storage group %(name)s doesn't exist, may have already been deleted. "
 "Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:720
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:874
 #, python-format
 msgid ""
 "Host %(host)s has already disconnected from storage group %(sgname)s. "
 "Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:740
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:894
 #, python-format
 msgid ""
 "LUN %(lun)s has already added to Storage Group %(sgname)s. Message: "
 "%(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:760
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:914
 #, python-format
 msgid "HLU %(hlu)s has already been removed from %(sgname)s. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:851
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1005
 #, python-format
 msgid "Invalid value for %(key)s, value is %(value)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:894
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1048
 #, python-format
 msgid "Error happened during storage pool querying, %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:915
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1069
 msgid "No array serial number returned, set as unknown."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1094
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1248
 #, python-format
 msgid "See unavailable iSCSI target: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1221
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1375
 #, python-format
 msgid "Toggle storage_vnx_ip_address from %(old)s to %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1300
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1454
 msgid ""
 "destroy_empty_storage_group: True. Empty storage group will be deleted "
 "after volume is detached."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1304
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1458
 msgid ""
 "initiator_auto_registration: False. Initiator auto registration is not "
 "enabled. Please register initiator manually."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1337
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1491
 #, python-format
 msgid ""
 "Create Volume: %(volume)s  Size: %(size)s pool: %(pool)s provisioning: "
 "%(provisioning)s tiering: %(tiering)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1385
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1539
 msgid "The given extra_spec or valid_values is None."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1387
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1541
 #, python-format
 msgid "The extra_spec: %s is invalid."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1413
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1567
 msgid "deduplicated and auto tiering can't be both enabled."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1417
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1571
 msgid "Compression Enabler is not installed. Can not create compressed volume."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1423
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1577
 msgid "Deduplication Enabler is not installed. Can not create deduplicated volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1429
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1583
 msgid "ThinProvisioning Enabler is not installed. Can not create thin volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1434
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1588
 msgid "FAST VP Enabler is not installed. Can't set tiering policy for the volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1463
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1617
 msgid ""
 "Failed to get target_pool_name and target_array_serial. 'location_info' "
 "is not in host['capabilities']."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1476
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1630
 msgid "Error on parsing target_pool_name/target_array_serial."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1594
-msgid "Storage-assisted migration failed during retype."
-msgstr ""
-
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1717
-#, python-format
-msgid "Delete Snapshot: %(snapshot)s"
-msgstr ""
-
 #: cinder/volume/drivers/emc/emc_vnx_cli.py:1748
-#, python-format
-msgid "Command to create the temporary Volume %s failed"
-msgstr ""
-
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1833
-#, python-format
-msgid "Storage Group %s is not found. Create it."
+msgid "Storage-assisted migration failed during retype."
 msgstr ""
 
 #: cinder/volume/drivers/emc/emc_vnx_cli.py:1875
 #, python-format
+msgid "Delete Snapshot: %(snapshot)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1909
+#, python-format
+msgid "Command to create the temporary Volume %s failed"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1968
+#, python-format
+msgid "Start to create consistency group: %(group_name)s id: %(id)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1977
+#, python-format
+msgid "Create consistency group %s failed."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1991
+#, python-format
+msgid "Start to delete consistency group: %(cg_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1997
+#, python-format
+msgid "Delete consistency group %s failed."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2019
+#, python-format
+msgid "Start to create cgsnapshot for consistency group: %(group_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2029
+#, python-format
+msgid "Create cg snapshot %s failed."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2046
+#, python-format
+msgid "Delete cgsnapshot %(snap_name)s for consistency group: %(group_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2056
+#, python-format
+msgid "Delete cgsnapshot %s failed."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2105
+#, python-format
+msgid "Storage Group %s is not found. Create it."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2147
+#, python-format
 msgid "Host %s has no iSCSI initiator"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1886
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2158
 #, python-format
 msgid "Host %s has no FC initiators"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1923
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2195
 #, python-format
 msgid "Get ISCSI targets %(tg)s to register initiator %(in)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1948
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2220
 #, python-format
 msgid "Get FC targets %(tg)s to register initiator %(in)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2039
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2311
 #, python-format
 msgid ""
 "Reach limitation set by configuration option max_luns_per_storage_group. "
 "Operation to add %(vol)s into Storage Group %(sg)s is rejected."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2063
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2335
 #, python-format
 msgid "Failed to add %(vol)s into %(sg)s after %(retries)s tries."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2099
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2371
 #, python-format
 msgid "Failed to find an available iSCSI targets for %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2163
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2435
 #, python-format
 msgid "Storage Group %s is not found. terminate_connection() is unnecessary."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2171
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2443
 #, python-format
 msgid "Volume %s is not found. It has probably been removed in VNX."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2179
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2451
 #, python-format
 msgid "Volume %(vol)s was not in Storage Group %(sg)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2187
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2459
 #, python-format
 msgid "Storage Group %s was empty, destroy it."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2197
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2469
 #, python-format
 msgid "Failed to destroy Storage Group %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2223
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2495
 msgid "Reference must contain lun_id element."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2231
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2503
 msgid "Find no lun with the specified lun_id."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2292
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2564
 #, python-format
 msgid "Storage pool %s is not supported by this Cinder Volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2316
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2588
 msgid "Error parsing output for FastCache Command."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2356
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2628
 msgid "The input lun is not in a manageable pool backend by cinder"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2384
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2656
 #, python-format
 msgid "Failed to find storage pool for source volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2396
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2668
 #, python-format
 msgid "Failed to find storage pool to create volume %s."
 msgstr ""
@@ -7457,9 +7643,9 @@ msgstr ""
 #: cinder/volume/drivers/fusionio/ioControl.py:284
 #: cinder/volume/drivers/ibm/ibmnas.py:110
 #: cinder/volume/drivers/ibm/storwize_svc/__init__.py:260
-#: cinder/volume/drivers/netapp/iscsi.py:123
-#: cinder/volume/drivers/netapp/nfs.py:670
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:197
+#: cinder/volume/drivers/netapp/iscsi.py:127
+#: cinder/volume/drivers/netapp/nfs.py:678
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:202
 #, python-format
 msgid "%s is not set"
 msgstr "%s is not set"
@@ -7578,7 +7764,7 @@ msgstr ""
 msgid "Array mismatch %(myid)s vs %(arid)s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/nfs.py:216 cinder/volume/drivers/netapp/nfs.py:486
+#: cinder/volume/drivers/hds/nfs.py:216 cinder/volume/drivers/netapp/nfs.py:494
 #, python-format
 msgid "Resizing file to %sG"
 msgstr ""
@@ -7588,7 +7774,7 @@ msgstr ""
 msgid "LUN %(id)s extended to %(size)s GB."
 msgstr ""
 
-#: cinder/volume/drivers/hds/nfs.py:224 cinder/volume/drivers/netapp/nfs.py:492
+#: cinder/volume/drivers/hds/nfs.py:224 cinder/volume/drivers/netapp/nfs.py:500
 msgid "Resizing image file failed."
 msgstr ""
 
@@ -8077,7 +8263,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1225
-#: cinder/volume/targets/lio.py:116 cinder/volume/targets/lio.py:142
 #, python-format
 msgid "%s"
 msgstr ""
@@ -8447,11 +8632,6 @@ msgstr ""
 msgid "Failed in _delete_snapfiles. Error: %s"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/ibmnas.py:287
-#, python-format
-msgid "Volume %s does not have provider_location specified, skipping."
-msgstr ""
-
 #: cinder/volume/drivers/ibm/storwize_svc/__init__.py:181
 #, python-format
 msgid "Failed getting details for pool %s"
@@ -8599,49 +8779,49 @@ msgid ""
 "vdisk copy operation: orig=%(orig)s new=%(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:766
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:769
 #, python-format
 msgid "Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:778
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:781
 #, python-format
 msgid ""
 "_check_volume_copy_ops: Volume %(vol)s does not have the specified vdisk "
 "copy operation: orig=%(orig)s new=%(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:894
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:897
 #, python-format
 msgid "Unable to retype: Volume %s is replicated."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:910
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:913
 #, python-format
 msgid ""
 "Unable to retype:  A copy of volume %s exists. Retyping would exceed the "
 "limit of 2 copies."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:945
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:972
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:948
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:975
 #, python-format
 msgid "No vdisk with the UID specified by source-id %s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:965
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:968
 msgid "Reference must contain source-id element."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:981
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:984
 msgid "The specified vdisk is mapped to a host."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1021
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1024
 msgid "Could not get pool data from the storage"
 msgstr "Could not get pool data from the storage"
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1022
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1025
 msgid "_update_volume_stats: Could not get storage pool data"
 msgstr ""
 
@@ -8943,333 +9123,322 @@ msgid ""
 "resolve the issue '%s'."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:70
+#: cinder/volume/drivers/netapp/iscsi.py:74
 #, python-format
 msgid "No metadata property %(prop)s defined for the LUN %(name)s"
 msgstr "No metadata property %(prop)s defined for the LUN %(name)s"
 
-#: cinder/volume/drivers/netapp/iscsi.py:176
+#: cinder/volume/drivers/netapp/iscsi.py:177
+#: cinder/volume/drivers/netapp/nfs.py:808
+#: cinder/volume/drivers/netapp/nfs.py:1378
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:312
+msgid "Pool is not available in the volume host field."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:209
 #, python-format
 msgid "No entry in LUN table for volume/snapshot %(name)s."
 msgstr "No entry in LUN table for volume/snapshot %(name)s."
 
-#: cinder/volume/drivers/netapp/iscsi.py:228
+#: cinder/volume/drivers/netapp/iscsi.py:261
 #, python-format
 msgid "Mapped LUN %(name)s to the initiator %(initiator_name)s"
 msgstr "Mapped LUN %(name)s to the initiator %(initiator_name)s"
 
-#: cinder/volume/drivers/netapp/iscsi.py:233
+#: cinder/volume/drivers/netapp/iscsi.py:266
 #, python-format
 msgid ""
 "Successfully fetched target details for LUN %(name)s and initiator "
 "%(initiator_name)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:239
-#, python-format
-msgid "Failed to get LUN target details for the LUN %s"
-msgstr "Failed to get LUN target details for the LUN %s"
-
-#: cinder/volume/drivers/netapp/iscsi.py:250
+#: cinder/volume/drivers/netapp/iscsi.py:283
 #, python-format
 msgid "Failed to get target portal for the LUN %s"
 msgstr "Failed to get target portal for the LUN %s"
 
-#: cinder/volume/drivers/netapp/iscsi.py:253
+#: cinder/volume/drivers/netapp/iscsi.py:286
 #, python-format
 msgid "Failed to get target IQN for the LUN %s"
 msgstr "Failed to get target IQN for the LUN %s"
 
-#: cinder/volume/drivers/netapp/iscsi.py:311
-#: cinder/volume/drivers/netapp/iscsi.py:558
-#: cinder/volume/drivers/netapp/nfs.py:102
-#: cinder/volume/drivers/netapp/nfs.py:209
+#: cinder/volume/drivers/netapp/iscsi.py:344
+#: cinder/volume/drivers/netapp/iscsi.py:598
+#: cinder/volume/drivers/netapp/nfs.py:111
+#: cinder/volume/drivers/netapp/nfs.py:218
 #, python-format
 msgid "Resizing %s failed. Cleaning volume."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:326
+#: cinder/volume/drivers/netapp/iscsi.py:359
 #, python-format
 msgid "Unmapped LUN %(name)s from the initiator %(initiator_name)s"
 msgstr "Unmapped LUN %(name)s from the initiator %(initiator_name)s"
 
-#: cinder/volume/drivers/netapp/iscsi.py:415
+#: cinder/volume/drivers/netapp/iscsi.py:389
+#, python-format
+msgid "Error provisioning volume %(lun_name)s on %(volume_name)s. Details: %(ex)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:455
 #, python-format
 msgid "Error mapping lun. Code :%(code)s, Message:%(message)s"
 msgstr "Error mapping lun. Code :%(code)s, Message:%(message)s"
 
-#: cinder/volume/drivers/netapp/iscsi.py:434
+#: cinder/volume/drivers/netapp/iscsi.py:474
 #, python-format
 msgid "Error unmapping lun. Code :%(code)s, Message:%(message)s"
 msgstr "Error unmapping lun. Code :%(code)s, Message:%(message)s"
 
-#: cinder/volume/drivers/netapp/iscsi.py:504
+#: cinder/volume/drivers/netapp/iscsi.py:544
 msgid "Object is not a NetApp LUN."
 msgstr "Object is not a NetApp LUN."
 
-#: cinder/volume/drivers/netapp/iscsi.py:536
+#: cinder/volume/drivers/netapp/iscsi.py:576
 #, python-format
 msgid "Message: %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:538
+#: cinder/volume/drivers/netapp/iscsi.py:578
 #, python-format
 msgid "Error getting lun attribute. Exception: %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:594
+#: cinder/volume/drivers/netapp/iscsi.py:635
 #, python-format
 msgid "No need to extend volume %s as it is already the requested new size."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:600
+#: cinder/volume/drivers/netapp/iscsi.py:641
 #, python-format
 msgid "Resizing lun %s directly to new size."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:627
+#: cinder/volume/drivers/netapp/iscsi.py:668
 #, python-format
 msgid "Lun %(path)s geometry failed. Message - %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:671
+#: cinder/volume/drivers/netapp/iscsi.py:712
 #, python-format
 msgid "Resizing lun %s using sub clone to new size."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:678
+#: cinder/volume/drivers/netapp/iscsi.py:719
 #, python-format
 msgid "%s cannot be sub clone resized as it is hosted on compressed volume"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:684
+#: cinder/volume/drivers/netapp/iscsi.py:725
 #, python-format
 msgid "%s cannot be sub clone resized as it contains no blocks."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:701
+#: cinder/volume/drivers/netapp/iscsi.py:742
 #, python-format
 msgid "Post clone resize lun %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:712
+#: cinder/volume/drivers/netapp/iscsi.py:753
 #, python-format
 msgid "Failure staging lun %s to tmp."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:717
+#: cinder/volume/drivers/netapp/iscsi.py:758
 #, python-format
 msgid "Failure moving new cloned lun to %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:721
+#: cinder/volume/drivers/netapp/iscsi.py:762
 #, python-format
 msgid "Failure deleting staged tmp lun %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:724
+#: cinder/volume/drivers/netapp/iscsi.py:765
 #, python-format
 msgid "Unknown exception in post clone resize lun %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:726
+#: cinder/volume/drivers/netapp/iscsi.py:767
 #, python-format
 msgid "Exception details: %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:735
+#: cinder/volume/drivers/netapp/iscsi.py:776
 #, python-format
 msgid "Failure getting lun info for %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:782
-#, python-format
-msgid "Failed to get vol with required size and extra specs for volume: %s"
-msgstr ""
-
-#: cinder/volume/drivers/netapp/iscsi.py:794
-#, python-format
-msgid "Error provisioning vol %(name)s on %(volume)s. Details: %(ex)s"
-msgstr ""
-
-#: cinder/volume/drivers/netapp/iscsi.py:1013
+#: cinder/volume/drivers/netapp/iscsi.py:1022
 #, python-format
 msgid "No cloned lun named %s found on the filer"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1114
-msgid "Cluster ssc is not updated. No volume stats found."
-msgstr ""
-
-#: cinder/volume/drivers/netapp/iscsi.py:1176
-#: cinder/volume/drivers/netapp/nfs.py:1301
+#: cinder/volume/drivers/netapp/iscsi.py:1193
+#: cinder/volume/drivers/netapp/nfs.py:1341
 msgid "Unsupported ONTAP version. ONTAP version 7.3.1 and above is supported."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1180
-#: cinder/volume/drivers/netapp/nfs.py:1305
-#: cinder/volume/drivers/netapp/utils.py:325
+#: cinder/volume/drivers/netapp/iscsi.py:1197
+#: cinder/volume/drivers/netapp/nfs.py:1345
+#: cinder/volume/drivers/netapp/utils.py:328
 msgid "Api version could not be determined."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1191
+#: cinder/volume/drivers/netapp/iscsi.py:1228
 #, python-format
-msgid "Failed to get vol with required size for volume: %s"
-msgstr "Failed to get vol with required size for volume: %s"
+msgid "Could not determine root volume name on %s."
+msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1300
+#: cinder/volume/drivers/netapp/iscsi.py:1307
 #, python-format
 msgid "Error finding luns for volume %s. Verify volume exists."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1510
+#: cinder/volume/drivers/netapp/iscsi.py:1568
 msgid "Volume refresh job already running. Returning..."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1516
+#: cinder/volume/drivers/netapp/iscsi.py:1574
 #, python-format
-msgid "Error refreshing vol capacity. Message: %s"
+msgid "Error refreshing volume info. Message: %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/iscsi.py:1524
-#, python-format
-msgid "Refreshing capacity info for %s."
-msgstr ""
-
-#: cinder/volume/drivers/netapp/nfs.py:107
-#: cinder/volume/drivers/netapp/nfs.py:214
+#: cinder/volume/drivers/netapp/nfs.py:116
+#: cinder/volume/drivers/netapp/nfs.py:223
 #, python-format
 msgid "NFS file %s not discovered."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:227
+#: cinder/volume/drivers/netapp/nfs.py:235
 #, python-format
 msgid "Copied image to volume %s using regular download."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:234
+#: cinder/volume/drivers/netapp/nfs.py:242
 #, python-format
 msgid "Registering image in cache %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:241
+#: cinder/volume/drivers/netapp/nfs.py:249
 #, python-format
 msgid ""
 "Exception while registering image %(image_id)s in cache. Exception: "
 "%(exc)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:267
+#: cinder/volume/drivers/netapp/nfs.py:275
 #, python-format
 msgid "Cloning from cache to destination %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:297
+#: cinder/volume/drivers/netapp/nfs.py:305
 #, python-format
 msgid "Cleaning cache for share %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:309
+#: cinder/volume/drivers/netapp/nfs.py:317
 #, python-format
 msgid "Exception during cache cleaning %(share)s. Message - %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:367
+#: cinder/volume/drivers/netapp/nfs.py:375
 #, python-format
 msgid "Exception during deleting %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:399
+#: cinder/volume/drivers/netapp/nfs.py:407
 #, python-format
 msgid "Image cloning unsuccessful for image %(image_id)s. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:415
+#: cinder/volume/drivers/netapp/nfs.py:423
 #, python-format
 msgid "Cloning image %s from cache"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:429
+#: cinder/volume/drivers/netapp/nfs.py:437
 #, python-format
 msgid "Unexpected exception during image cloning in share %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:435
+#: cinder/volume/drivers/netapp/nfs.py:443
 #, python-format
 msgid "Checking image clone %s from glance share."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:454
+#: cinder/volume/drivers/netapp/nfs.py:462
 #, python-format
 msgid "Image will locally be converted to raw %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:461
+#: cinder/volume/drivers/netapp/nfs.py:469
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "Converted to raw, but format is now %s"
 
-#: cinder/volume/drivers/netapp/nfs.py:471
+#: cinder/volume/drivers/netapp/nfs.py:479
 #, python-format
 msgid "Performing post clone for %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:478
+#: cinder/volume/drivers/netapp/nfs.py:486
 msgid "NFS file could not be discovered."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:514
+#: cinder/volume/drivers/netapp/nfs.py:522
 msgid "Discover file retries exhausted."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:572
+#: cinder/volume/drivers/netapp/nfs.py:580
 msgid "Unexpected exception while short listing used share."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:587
+#: cinder/volume/drivers/netapp/nfs.py:595
 msgid "Image location not present."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:624
-msgid "Container size smaller than required file size."
-msgstr ""
-
 #: cinder/volume/drivers/netapp/nfs.py:632
-#, python-format
-msgid "Destination %s already exists."
+msgid "Container size smaller than required file size."
 msgstr ""
 
 #: cinder/volume/drivers/netapp/nfs.py:640
 #, python-format
+msgid "Destination %s already exists."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:648
+#, python-format
 msgid "Exception moving file %(src)s. Message - %(e)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:742
+#: cinder/volume/drivers/netapp/nfs.py:767
 #, python-format
 msgid "Shares on vserver %s will only be used for provisioning."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:746
-#: cinder/volume/drivers/netapp/nfs.py:948
+#: cinder/volume/drivers/netapp/nfs.py:771
 msgid "No vserver set in config. SSC will be disabled."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:795
+#: cinder/volume/drivers/netapp/nfs.py:824
+#: cinder/volume/drivers/netapp/nfs.py:1388
 #, python-format
 msgid "Exception creating vol %(name)s on share %(share)s. Details: %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:804
+#: cinder/volume/drivers/netapp/nfs.py:834
+#: cinder/volume/drivers/netapp/nfs.py:1393
 #, python-format
 msgid "Volume %s could not be created on shares."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:867
+#: cinder/volume/drivers/netapp/nfs.py:880
 #, python-format
 msgid "No interface found on cluster for ip %s"
 msgstr "No interface found on cluster for ip %s"
 
-#: cinder/volume/drivers/netapp/nfs.py:908
+#: cinder/volume/drivers/netapp/nfs.py:921
 #, python-format
 msgid ""
 "No volume on cluster with vserver\n"
@@ -9278,118 +9447,119 @@ msgid ""
 "                                   "
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:915
+#: cinder/volume/drivers/netapp/nfs.py:928
 #, python-format
 msgid ""
 "Cloning with params volume %(volume)s, src %(src_path)s,\n"
 "                    dest %(dest_path)s, vserver %(vserver)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:980
-msgid "No cluster ssc stats found. Wait for next volume stats update."
-msgstr ""
-
-#: cinder/volume/drivers/netapp/nfs.py:997
+#: cinder/volume/drivers/netapp/nfs.py:1037
 msgid "No shares found hence skipping ssc refresh."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1127
+#: cinder/volume/drivers/netapp/nfs.py:1167
 #, python-format
 msgid "Copied image %(img)s to volume %(vol)s using copy offload workflow."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1134
+#: cinder/volume/drivers/netapp/nfs.py:1174
 #, python-format
 msgid "Copy offload workflow unsuccessful. %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1158
+#: cinder/volume/drivers/netapp/nfs.py:1198
 #, python-format
 msgid "No vserver owning the ip %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1194
+#: cinder/volume/drivers/netapp/nfs.py:1234
 #, python-format
 msgid "Error in workflow copy from cache. %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1214
+#: cinder/volume/drivers/netapp/nfs.py:1254
 msgid "Source host details not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1264
+#: cinder/volume/drivers/netapp/nfs.py:1304
 #, python-format
 msgid "Converted to raw, but format is now %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/nfs.py:1350
+#: cinder/volume/drivers/netapp/nfs.py:1382
+#, python-format
+msgid "Creating volume at location %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:1423
 #, python-format
 msgid "No storage path found for export path %s"
 msgstr "No storage path found for export path %s"
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:422
+#: cinder/volume/drivers/netapp/ssc_utils.py:424
 #, python-format
 msgid "Running stale ssc refresh job for %(server)s and vserver %(vs)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:456
+#: cinder/volume/drivers/netapp/ssc_utils.py:458
 #, python-format
 msgid "Successfully completed stale refresh job for %(server)s and vserver %(vs)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:483
+#: cinder/volume/drivers/netapp/ssc_utils.py:485
 #, python-format
 msgid "Running cluster latest ssc job for %(server)s and vserver %(vs)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:489
+#: cinder/volume/drivers/netapp/ssc_utils.py:491
 #, python-format
 msgid "Successfully completed ssc job for %(server)s and vserver %(vs)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:501
+#: cinder/volume/drivers/netapp/ssc_utils.py:503
 msgid "Backend not a VolumeDriver."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:503
+#: cinder/volume/drivers/netapp/ssc_utils.py:505
 msgid "Backend server not NaServer."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:506
+#: cinder/volume/drivers/netapp/ssc_utils.py:508
 msgid "ssc job in progress. Returning... "
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:518
+#: cinder/volume/drivers/netapp/ssc_utils.py:520
 msgid "refresh stale ssc job in progress. Returning... "
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:614
+#: cinder/volume/drivers/netapp/ssc_utils.py:616
 msgid "Fatal error: User not permitted to query NetApp volumes."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/ssc_utils.py:621
+#: cinder/volume/drivers/netapp/ssc_utils.py:623
 #, python-format
 msgid ""
 "The user does not have access or sufficient privileges to use all netapp "
 "apis. The following extra_specs will fail or be ignored: %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:128
+#: cinder/volume/drivers/netapp/utils.py:131
 #, python-format
 msgid "Failed to invoke ems. Message : %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:141
+#: cinder/volume/drivers/netapp/utils.py:144
 msgid ""
 "It is not the recommended way to use drivers by NetApp. Please use "
 "NetAppDriver to achieve the functionality."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:164
+#: cinder/volume/drivers/netapp/utils.py:167
 msgid "Requires an NaServer instance."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:322
+#: cinder/volume/drivers/netapp/utils.py:325
 msgid "Unsupported Clustered Data ONTAP version."
 msgstr ""
 
@@ -9428,196 +9598,203 @@ msgstr ""
 msgid "Response error code - %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:102
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:104
 #, python-format
 msgid "Error resolving host %(host)s. Error - %(e)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:112
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:114
 msgid "Controller ips not valid after resolution."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:115
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:117
 msgid "Embedded mode detected."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:118
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:120
 msgid "Proxy mode detected."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:129
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:131
 #, python-format
 msgid "System with controller addresses [%s] is not registered with web service."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:147
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:149
 msgid "Waiting for web service array communication."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:151
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:153
 #, python-format
 msgid ""
 "Failure in communication between web service and array. Waited %s "
 "seconds. Verify array configuration parameters."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:161
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:163
 #, python-format
 msgid "System %(id)s found with bad status - %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:163
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:165
 #, python-format
 msgid "System %(id)s has %(status)s status."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:179
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:181
 #, python-format
 msgid "Configured storage pools %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:275
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:278
 #, python-format
 msgid "No pit image found in snapshot group %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:301
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:335
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:336
+#, python-format
+msgid "Pools %s does not exist"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:342
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:357
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:374
 #, python-format
 msgid "Created volume with label %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:304
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:345
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:360
 #, python-format
 msgid "Error creating volume. Msg - %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:305
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:361
 #, python-format
 msgid "Failure creating volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:321
-#, python-format
-msgid "No storage pool found with available capacity %s."
-msgstr ""
-
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:344
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:383
 #, python-format
 msgid "Failure deleting snap vol. Error: %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:346
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:385
 msgid "Snapshot volume not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:362
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:401
 #, python-format
 msgid "Copying src vol %(src)s to dest vol %(dst)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:375
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:414
 #, python-format
 msgid "Vol copy job status %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:376
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:415
 #, python-format
 msgid "Vol copy job for dest %s failed."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:379
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:418
 #, python-format
 msgid "Vol copy job completed for dest %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:387
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:426
 #, python-format
 msgid "Failure deleting job %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:389
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:428
 #, python-format
 msgid "Volume copy job for src vol %s not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:391
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:430
 #, python-format
 msgid "Copy job to dest vol %s completed."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:403
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:442
 #, python-format
 msgid "Failure deleting temp snapshot %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:412
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:451
 #, python-format
 msgid "Volume %s already deleted."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:436
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:475
 #, python-format
 msgid "Created snap grp with label %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:447
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:486
 #, python-format
 msgid "Snapshot %s already deleted."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:473
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:512
 #, python-format
 msgid "Mapped volume %(id)s to the initiator %(initiator_name)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:476
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:515
 #, python-format
 msgid ""
 "Successfully fetched target details for volume %(id)s and initiator "
 "%(initiator_name)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:516
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:555
 #, python-format
 msgid "No good iscsi portal information found for %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:541
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:580
 #, python-format
 msgid "Message - %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:556
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:595
 #, python-format
 msgid "Host with port %(port)s and type %(type)s not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:561
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:600
 #, python-format
 msgid "Creating host with port %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:574
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:613
 #, python-format
 msgid "Host type %s not supported."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:584
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:623
 msgid "No free luns. Host might exceeded max luns."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:614
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:653
 #, python-format
 msgid "Mapping not found for %(vol)s to host %(ht)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:668
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:705
+#, python-format
+msgid "No storage pool found with available capacity %s."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:724
 #, python-format
 msgid "Extended volume with label %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/iscsi.py:682
+#: cinder/volume/drivers/netapp/eseries/iscsi.py:738
 msgid "Returning as clean tmp vol job already running."
 msgstr ""
 
@@ -10160,123 +10337,123 @@ msgstr "Cannot parse list-view output: %s"
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:206
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:211
 #, python-format
 msgid ""
 "Invalid hp3parclient version found (%(found)s). Version %(minimum)s or "
 "greater required."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:228
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:247
 #, python-format
 msgid "Failed to Login to 3PAR (%(url)s) because %(err)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:239
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:258
 msgid "You must install hp3parclient before using 3PAR drivers."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:245
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:264
 #, python-format
 msgid "HP3PARCommon %(common_ver)s, hp3parclient %(rest_ver)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:622
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:282
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:643
 #, python-format
 msgid "CPG (%s) doesn't exist on array"
 msgstr "CPG (%s) doesn't exist on array"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:271
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:290
 #, python-format
 msgid "Failed to get domain because CPG (%s) doesn't exist on array."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:304
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:400
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:323
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:419
 #, python-format
 msgid "Virtual volume '%s' doesn't exist on array."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:337
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:356
 #, python-format
 msgid "Volume type ID '%s' is invalid."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:346
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:365
 #, python-format
 msgid "Virtual volume '%(ref)s' renamed to '%(new)s'."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:369
 #, python-format
 msgid "Virtual volume %(disp)s '%(new)s' is being retyped."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:355
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:374
 #, python-format
 msgid "Virtual volume %(disp)s successfully retyped to %(new_type)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:361
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:380
 #, python-format
 msgid "Failed to manage virtual volume %(disp)s due to error during retype."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:370
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:389
 #, python-format
 msgid "Virtual volume %(disp)s '%(new)s' is now being managed."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:391
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:410
 msgid "Reference must be for an unmanaged virtual volume."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:415
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:434
 #, python-format
 msgid ""
 "Virtual volume %(disp)s '%(vol)s' is no longer managed. Volume renamed to"
 " '%(new)s'."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:444
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:463
 #, python-format
 msgid "Error extending volume: %(vol)s. Exception: %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:649
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:669
 #, python-format
 msgid "3PAR vlun %(name)s not found on host %(host)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:672
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:692
 #, python-format
 msgid "3PAR vlun for volume %(name)s not found on host %(host)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:711
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:731
 #, python-format
 msgid ""
 "3PAR vlun for volume '%(name)s' was deleted, but the host '%(host)s' was "
 "not deleted because: %(reason)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:811
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:831
 #, python-format
 msgid "Error creating QOS rule %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:820
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:840
 #, python-format
 msgid "VV Set %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:862
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:882
 #, python-format
 msgid "Must specify a valid persona %(valid)s,value '%(persona)s' is invalid."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:941
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:961
 #, python-format
 msgid ""
 "Must specify a valid provisioning type %(valid)s, value '%(prov)s' is "
@@ -10285,162 +10462,155 @@ msgstr ""
 "Must specify a valid provisioning type %(valid)s, value '%(prov)s' is "
 "invalid."
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1027
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1047
 #, python-format
 msgid "Volume (%s) already exists on array"
 msgstr "Volume (%s) already exists on array"
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1138
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1158
 msgid ""
 "The volume is currently busy on the 3PAR and cannot be deleted at this "
 "time. You can try again later."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1150
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1170
 #, python-format
 msgid "Delete volume id not found. Removing from cinder: %(id)s Ex: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1214
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1234
 #, python-format
 msgid "Error extending volume %(id)s. Ex: %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1298
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1318
 #, python-format
 msgid "Failure in update_volume_key_value_pair:%s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1312
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1332
 #, python-format
 msgid "Failure in clear_volume_key_value_pair:%s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1324
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1344
 #, python-format
 msgid "Error attaching volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1332
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1352
 #, python-format
 msgid "Error detaching volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1432
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1452
 #, python-format
 msgid ""
 "Copy volume task failed: convert_to_base_volume: id=%(id)s, "
 "status=%(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1453
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1473
 #, python-format
 msgid "Completed: convert_to_base_volume: id=%s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1456
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1476
 #, python-format
 msgid "Volume (%s) already exists on array."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1485
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1505
 #, python-format
 msgid "Delete Snapshot id not found. Removing from cinder: %(id)s Ex: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1565
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1585
 #, python-format
 msgid "Modifying %(volume_name)s userCPG from %(old_cpg)s to %(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1577
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1613
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1597
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1633
 #, python-format
 msgid ""
 "Tune volume task stopped before it was done: volume_name=%(volume_name)s,"
 " task-status=%(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1585
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1605
 #, python-format
 msgid "Converting %(volume_name)s to full provisioning with userCPG=%(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1590
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1610
 #, python-format
 msgid "Converting %(volume_name)s to thin provisioning with userCPG=%(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1606
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1626
 #, python-format
 msgid "tunevv failed because the volume '%s' has snapshots."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1636
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1656
 #, python-format
 msgid "Cannot retype from HP3PARDriver to %s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1642
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1662
 msgid "Cannot retype from one 3PAR array to another."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1646
-#, python-format
-msgid ""
-"Invalid current snapCPG name for retype.  The volume may be in a "
-"transitioning state.  snapCpg='%s'."
-msgstr ""
-
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1654
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1668
 #, python-format
 msgid "Invalid new snapCPG name for retype.  new_snap_cpg='%s'."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1660
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1675
 msgid "Cannot retype to a CPG in a different domain."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1664
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1679
 msgid "Cannot retype to a snap CPG in a different domain."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1866
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1881
 #, python-format
 msgid ""
 "Modifying %(volume_name)s snap_cpg from %(old_snap_cpg)s to "
 "%(new_snap_cpg)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1877
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1892
 #, python-format
 msgid "Modifying %s comments."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1886
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1901
 #, python-format
 msgid ""
 "Retype revert %(volume_name)s snap_cpg from %(new_snap_cpg)s back to "
 "%(old_snap_cpg)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1896
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1911
 #, python-format
 msgid "Exception during snapCPG revert: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1965
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1980
 #, python-format
 msgid "Unexpected error when retype() tried to deleteVolumeSet(%s)"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1987
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1991
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2002
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2006
 #, python-format
 msgid "Unexpected error when retype() revert tried to deleteVolumeSet(%s)"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:2000
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2015
 #, python-format
 msgid ""
 "%(exception)s: Exception during revert of retype for volume "
@@ -10448,60 +10618,60 @@ msgid ""
 " restored."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:2012
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2027
 #, python-format
 msgid ""
 "%(exception)s: Exception during revert of retype for volume "
 "%(volume_name)s. Failed to remove from new volume set %(new_vvs)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_fc.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_fc.py:258
 msgid "Need to remove FC Zone, building initiator target map"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:139
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:140
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:173
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:174
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:179
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:180
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:280
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:281
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:417
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:418
 msgid ""
 "Host exists without CHAP credentials set and has iSCSI attachments but "
 "CHAP is enabled.  Updating host with new CHAP credentials."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:444
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:445
 msgid "Host has no CHAP key, but CHAP is enabled."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:448
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:449
 msgid "No host or VLUNs exist. Generating new CHAP key."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:476
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:477
 msgid "Non-iSCSI VLUN detected."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:480
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:481
 msgid "No VLUN contained CHAP credentials. Generating new CHAP key."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:514
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:515
 #, python-format
 msgid "Volume %s doesn't exist on array."
 msgstr ""
@@ -10710,32 +10880,36 @@ msgstr ""
 msgid "Error occurred during image transfer."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/io_util.py:129
+#: cinder/volume/drivers/vmware/error_util.py:90
+msgid "There is no virtual disk device."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/io_util.py:130
 #, python-format
 msgid "Glance image: %s is in killed state."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/io_util.py:138
+#: cinder/volume/drivers/vmware/io_util.py:139
 #, python-format
 msgid "Glance image %(id)s is in unknown state - %(state)s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/io_util.py:146
+#: cinder/volume/drivers/vmware/io_util.py:147
 #, python-format
 msgid "Error occurred while writing to image: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/read_write_util.py:205
-#: cinder/volume/drivers/vmware/read_write_util.py:294
+#: cinder/volume/drivers/vmware/read_write_util.py:206
+#: cinder/volume/drivers/vmware/read_write_util.py:299
 msgid "Could not retrieve URL from lease."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/read_write_util.py:208
+#: cinder/volume/drivers/vmware/read_write_util.py:209
 #, python-format
 msgid "Opening vmdk url: %s for write."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/read_write_util.py:297
+#: cinder/volume/drivers/vmware/read_write_util.py:302
 #, python-format
 msgid "Opening vmdk url: %s for read."
 msgstr ""
@@ -10775,330 +10949,345 @@ msgstr ""
 msgid "Error in %(attr)s. Detailed error: %(excep)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:174
+#: cinder/volume/drivers/vmware/vmdk.py:181
 #, python-format
 msgid "Invalid disk type: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:187
+#: cinder/volume/drivers/vmware/vmdk.py:195
 msgid ""
 "The VMware ESX VMDK driver is now deprecated and will be removed in the "
 "Juno release. The VMware vCenter VMDK driver will remain and continue to "
 "be supported."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:239
+#: cinder/volume/drivers/vmware/vmdk.py:247
 #, python-format
 msgid "%s not set."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:247
-#: cinder/volume/drivers/vmware/vmdk.py:1479
+#: cinder/volume/drivers/vmware/vmdk.py:255
+#: cinder/volume/drivers/vmware/vmdk.py:1711
 #, python-format
 msgid "Successfully setup driver: %(driver)s for server: %(ip)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:289
+#: cinder/volume/drivers/vmware/vmdk.py:297
 #, python-format
 msgid "Not able to find a suitable datastore for the volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:312
+#: cinder/volume/drivers/vmware/vmdk.py:320
 msgid "Backing not available, no operation to be performed."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:380
+#: cinder/volume/drivers/vmware/vmdk.py:388
 #, python-format
 msgid ""
 "Unable to pick datastore to accommodate %(size)s bytes from the "
 "datastores: %(dss)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:416
+#: cinder/volume/drivers/vmware/vmdk.py:424
 #, python-format
 msgid "No such storage profile '%s; is defined in vCenter."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:443
+#: cinder/volume/drivers/vmware/vmdk.py:451
 #, python-format
 msgid "Aborting since none of the datastores match the given storage profile %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:448
+#: cinder/volume/drivers/vmware/vmdk.py:456
 #, python-format
 msgid ""
 "Ignoring storage profile %s requirement for this volume since policy "
 "based placement is disabled."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:555
+#: cinder/volume/drivers/vmware/vmdk.py:563
 #, python-format
 msgid ""
 "Unable to find suitable datastore for volume of size: %(vol)s GB under "
 "host: %(host)s. More details: %(excep)s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:565
+#: cinder/volume/drivers/vmware/vmdk.py:573
 #, python-format
 msgid "Unable to find host to accommodate a disk of size: %s in the inventory."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:596
+#: cinder/volume/drivers/vmware/vmdk.py:604
 #, python-format
 msgid ""
 "Unable to find suitable datastore for volume: %(vol)s under host: "
 "%(host)s. More details: %(excep)s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:606
+#: cinder/volume/drivers/vmware/vmdk.py:614
 #, python-format
 msgid "Unable to create volume: %s in the inventory."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:632
+#: cinder/volume/drivers/vmware/vmdk.py:640
 #, python-format
 msgid "There is no backing for the volume: %s. Need to create one."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:645
+#: cinder/volume/drivers/vmware/vmdk.py:653
 #, python-format
 msgid "Trying to boot from an empty volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:654
+#: cinder/volume/drivers/vmware/vmdk.py:662
 #, python-format
 msgid ""
 "Returning connection_info: %(info)s for volume: %(volume)s with "
 "connector: %(connector)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:702
+#: cinder/volume/drivers/vmware/vmdk.py:710
 #, python-format
 msgid "Snapshot of volume not supported in state: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:707
+#: cinder/volume/drivers/vmware/vmdk.py:715
 #, python-format
 msgid "There is no backing, so will not create snapshot: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:712
+#: cinder/volume/drivers/vmware/vmdk.py:720
 #, python-format
 msgid "Successfully created snapshot: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:733
+#: cinder/volume/drivers/vmware/vmdk.py:741
 #, python-format
 msgid "Delete snapshot of volume not supported in state: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:738
+#: cinder/volume/drivers/vmware/vmdk.py:746
 #, python-format
 msgid "There is no backing, and so there is no snapshot: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:742
+#: cinder/volume/drivers/vmware/vmdk.py:750
 #, python-format
 msgid "Successfully deleted snapshot: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:783
+#: cinder/volume/drivers/vmware/vmdk.py:791
 #, python-format
 msgid "Successfully cloned new backing: %(back)s from source VMDK file: %(vmdk)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:800
+#: cinder/volume/drivers/vmware/vmdk.py:808
 #, python-format
 msgid ""
 "There is no backing for the source volume: %(svol)s. Not creating any "
 "backing for the volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:831
+#: cinder/volume/drivers/vmware/vmdk.py:839
 #, python-format
 msgid ""
 "There is no backing for the source snapshot: %(snap)s. Not creating any "
 "backing for the volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:840
-#: cinder/volume/drivers/vmware/vmdk.py:1595
+#: cinder/volume/drivers/vmware/vmdk.py:848
+#: cinder/volume/drivers/vmware/vmdk.py:1827
 #, python-format
 msgid ""
 "There is no snapshot point for the snapshotted volume: %(snap)s. Not "
 "creating any backing for the volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:875
+#: cinder/volume/drivers/vmware/vmdk.py:883
 #, python-format
 msgid "Cannot create image of disk format: %s. Only vmdk disk format is accepted."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:914
+#: cinder/volume/drivers/vmware/vmdk.py:922
 #, python-format
 msgid "Error occurred while deleting temporary disk: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:928
+#: cinder/volume/drivers/vmware/vmdk.py:936
 #, python-format
 msgid "Error occurred while copying %(src)s to %(dst)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:990
+#: cinder/volume/drivers/vmware/vmdk.py:998
 #, python-format
 msgid "Error occurred while copying image: %(image_id)s to %(path)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1000
+#: cinder/volume/drivers/vmware/vmdk.py:1008
 #, python-format
 msgid "Error occurred while deleting descriptor: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1029
+#: cinder/volume/drivers/vmware/vmdk.py:1037
 #, python-format
 msgid "Error occurred while deleting backing: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1114
+#: cinder/volume/drivers/vmware/vmdk.py:1122
 #, python-format
 msgid "Error occured while creating volume: %(id)s from image: %(image_id)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1137
+#: cinder/volume/drivers/vmware/vmdk.py:1145
 #, python-format
 msgid "Exception in _select_ds_for_volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1181
+#: cinder/volume/drivers/vmware/vmdk.py:1189
 #, python-format
 msgid "Exception in copy_image_to_volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1185
+#: cinder/volume/drivers/vmware/vmdk.py:1193
 #, python-format
 msgid "Deleting the backing: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1189
+#: cinder/volume/drivers/vmware/vmdk.py:1197
 #, python-format
 msgid "Done copying image: %(id)s to volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1200
+#: cinder/volume/drivers/vmware/vmdk.py:1208
 #, python-format
 msgid ""
 "The backing is not found, so there is no need to extend the vmdk virtual "
 "disk for the volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1222
+#: cinder/volume/drivers/vmware/vmdk.py:1230
 #, python-format
 msgid "Unable to extend the size of the vmdk virtual disk at the path %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1272
+#: cinder/volume/drivers/vmware/vmdk.py:1280
 #, python-format
 msgid "Exception in copying the image to the volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1306
+#: cinder/volume/drivers/vmware/vmdk.py:1317
 msgid "Upload to glance of attached volume is not supported."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1317
+#: cinder/volume/drivers/vmware/vmdk.py:1328
 #, python-format
 msgid "Backing not found, creating for volume: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1336
+#: cinder/volume/drivers/vmware/vmdk.py:1347
 #, python-format
 msgid "Done copying volume %(vol)s to a new image %(img)s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1353
-#: cinder/volume/drivers/vmware/vmdk.py:1382
+#: cinder/volume/drivers/vmware/vmdk.py:1364
+#: cinder/volume/drivers/vmware/vmdk.py:1393
 #, python-format
 msgid "Done extending volume %(vol)s to size %(size)s GB."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1357
+#: cinder/volume/drivers/vmware/vmdk.py:1368
 #, python-format
 msgid ""
 "Relocating volume %s vmdk to a different datastore since trying to extend"
 " vmdk file in place failed."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1365
+#: cinder/volume/drivers/vmware/vmdk.py:1376
 #, python-format
 msgid "Not able to find a different datastore to place the extended volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1368
+#: cinder/volume/drivers/vmware/vmdk.py:1379
 #, python-format
 msgid "Selected datastore %(ds)s to place extended volume of size %(size)s GB."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1380
+#: cinder/volume/drivers/vmware/vmdk.py:1391
 #, python-format
 msgid "Not able to relocate volume %s for extending."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1429
+#: cinder/volume/drivers/vmware/vmdk.py:1492
+msgid "Error occurred while creating temporary backing."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:1557
+#, python-format
+msgid ""
+"Cannot undo volume rename; old name was %(old_name)s and new name is "
+"%(new_name)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:1580
+msgid "Volume cannot be restored since it contains snapshots."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:1661
 #, python-format
 msgid "PBM WSDL file %s is missing!"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1432
+#: cinder/volume/drivers/vmware/vmdk.py:1664
 #, python-format
 msgid "Using PBM WSDL location: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1443
+#: cinder/volume/drivers/vmware/vmdk.py:1675
 #, python-format
 msgid "Using overridden vmware_host_version from config: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1447
+#: cinder/volume/drivers/vmware/vmdk.py:1679
 #, python-format
 msgid "Fetched VC server version: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1454
+#: cinder/volume/drivers/vmware/vmdk.py:1686
 #, python-format
 msgid "Version string '%s' is not parseable"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1468
+#: cinder/volume/drivers/vmware/vmdk.py:1700
 #, python-format
 msgid "Not able to configure PBM for VC server: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1527
+#: cinder/volume/drivers/vmware/vmdk.py:1759
 #, python-format
 msgid "Relocating volume: %(backing)s to %(ds)s and %(rp)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1573
+#: cinder/volume/drivers/vmware/vmdk.py:1805
 #: cinder/volume/drivers/vmware/volumeops.py:1044
 #, python-format
 msgid "Successfully created clone: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1587
+#: cinder/volume/drivers/vmware/vmdk.py:1819
 #, python-format
 msgid ""
 "There is no backing for the snapshotted volume: %(snap)s. Not creating "
 "any backing for the volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1624
+#: cinder/volume/drivers/vmware/vmdk.py:1856
 #, python-format
 msgid ""
 "There is no backing for the source volume: %(src)s. Not creating any "
 "backing for volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1632
+#: cinder/volume/drivers/vmware/vmdk.py:1864
 #, python-format
 msgid "Linked clone of source volume not supported in state: %s."
 msgstr ""
@@ -11178,39 +11367,97 @@ msgstr ""
 msgid "Successfully deleted file: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1157
+#: cinder/volume/drivers/vmware/volumeops.py:1145
+#, python-format
+msgid "Virtual disk device of backing: %s not found."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:1160
 #, python-format
 msgid "Invalid disk backing: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1247
+#: cinder/volume/drivers/vmware/volumeops.py:1259
 #, python-format
 msgid "Successfully copied disk at: %(src)s to: %(dest)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1265
+#: cinder/volume/drivers/vmware/volumeops.py:1277
 #, python-format
 msgid "Deleted vmdk file: %s."
 msgstr ""
 
-#: cinder/volume/drivers/windows/vhdutils.py:132
+#: cinder/volume/drivers/windows/remotefs.py:52
+msgid "Link path already exists and its not a symlink"
+msgstr ""
+
+#: cinder/volume/drivers/windows/remotefs.py:80
+#, python-format
+msgid "Could not create symbolic link. Link: %(link)s Target %(target)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/remotefs.py:115
+#, python-format
+msgid "Mounting share: %s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/remotefs.py:118
+#, python-format
+msgid ""
+"Unable to mount SMBFS share: %(smbfs_share)s WMI exception: "
+"%(wmi_exc)sOptions: %(options)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/remotefs.py:137
+#, python-format
+msgid "Could not get share %s capacity info."
+msgstr ""
+
+#: cinder/volume/drivers/windows/smbfs.py:66
+#, python-format
+msgid ""
+"This system platform (%s) is not supported. This driver supports only "
+"Win32 platforms."
+msgstr ""
+
+#: cinder/volume/drivers/windows/smbfs.py:76
+#, python-format
+msgid "File already exists at: %s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/smbfs.py:81
+#, python-format
+msgid "Unsupported volume format: %s "
+msgstr ""
+
+#: cinder/volume/drivers/windows/vhdutils.py:220
 #, python-format
 msgid "Opening virtual disk failed with error: %s"
 msgstr ""
 
-#: cinder/volume/drivers/windows/vhdutils.py:143
+#: cinder/volume/drivers/windows/vhdutils.py:231
 #, python-format
 msgid "Unsupported virtual disk extension: %s"
 msgstr ""
 
-#: cinder/volume/drivers/windows/vhdutils.py:163
+#: cinder/volume/drivers/windows/vhdutils.py:249
 #, python-format
 msgid "Virtual disk resize failed with error: %s"
 msgstr ""
 
-#: cinder/volume/drivers/windows/vhdutils.py:206
+#: cinder/volume/drivers/windows/vhdutils.py:271
 #, python-format
-msgid "Virtual disk conversion failed with error: %s"
+msgid "Virtual disk merge failed with error: %s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/vhdutils.py:318
+#, python-format
+msgid "Virtual disk creation failed with error: %s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/vhdutils.py:423
+#, python-format
+msgid "Virtual disk reconnect failed with error: %s"
 msgstr ""
 
 #: cinder/volume/drivers/windows/windows_utils.py:56
@@ -11339,51 +11586,51 @@ msgstr ""
 msgid "ZFSSA version: %s"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/restclient.py:279
+#: cinder/volume/drivers/zfssa/restclient.py:282
 #, python-format
 msgid "REST Not Available: %s"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/restclient.py:284
+#: cinder/volume/drivers/zfssa/restclient.py:288
 #, python-format
 msgid "Server Busy retry request: %s"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/restclient.py:290
+#: cinder/volume/drivers/zfssa/restclient.py:294
 #, python-format
 msgid "Authorizing request: %(zfssaurl)sretry: %(retry)d ."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/restclient.py:307
+#: cinder/volume/drivers/zfssa/restclient.py:311
 #, python-format
 msgid "URLError: %s"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssaiscsi.py:95
+#: cinder/volume/drivers/zfssa/zfssaiscsi.py:98
 #, python-format
 msgid "Connecting to host: %s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssaiscsi.py:110
+#: cinder/volume/drivers/zfssa/zfssaiscsi.py:113
 #, python-format
 msgid ""
 "zfssa_initiator: %(ini)s wont be used on zfssa_initiator_group= "
 "%(inigrp)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssaiscsi.py:246
+#: cinder/volume/drivers/zfssa/zfssaiscsi.py:249
 #, python-format
 msgid "Snapshot %s: has clones"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssaiscsi.py:261
+#: cinder/volume/drivers/zfssa/zfssaiscsi.py:264
 #, python-format
 msgid ""
 "Error verifying clone size on Volume clone: %(clone)s Size: %(size)d "
 "onSnapshot: %(snapshot)s"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssaiscsi.py:359
+#: cinder/volume/drivers/zfssa/zfssaiscsi.py:362
 #, python-format
 msgid "Clone Volume:%(volume)s failed from source volume:%(src_vref)s"
 msgstr ""
diff --git a/cinder/locale/es/LC_MESSAGES/cinder-log-error.po b/cinder/locale/es/LC_MESSAGES/cinder-log-error.po
index ea1600d0571..c9d55a9e6cf 100644
--- a/cinder/locale/es/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/es/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-09-01 20:31+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/cinder/language/"
 "es/)\n"
@@ -29,6 +29,14 @@ msgstr "Se está descartando excepción original: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "La excepción inesperada ha ocurrido %d vez(veces)... reintentando."
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "en llamada en bucle de duración fija"
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "en llamada en bucle dinámica"
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr "No hay manejador para coincidencias de clase %s"
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr "Ha ocurrido un error al interpretar la regla %r"
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr "Excepción durante limpieza de rpc."
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "Excepción no controlada"
diff --git a/cinder/locale/es/LC_MESSAGES/cinder-log-info.po b/cinder/locale/es/LC_MESSAGES/cinder-log-info.po
index daaedac303c..e09f638158e 100644
--- a/cinder/locale/es/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/es/LC_MESSAGES/cinder-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/cinder/language/"
 "es/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr "Eventlet oculto escuchando en %(port)s para el proceso %(pid)d"
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -28,3 +33,55 @@ msgstr "Omitiendo la tarea periódica %(task)s porque el intervalo es negativo"
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "Omitiendo la tarea periódica %(task)s porque está inhabilitada"
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "Se ha captado %s, saliendo"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "El proceso padre se ha detenido inesperadamente, saliendo"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr "Hijo captado %s, saliendo"
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "Bifurcación demasiado rápida, en reposo"
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "Se ha iniciado el hijo %d"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "Iniciando %d trabajadores"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "Hijo %(pid)d matado por señal %(sig)d"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "El hijo %(pid)s ha salido con el estado %(code)d"
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "Se ha captado %s, deteniendo hijos"
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr "Espéra llamada después que el hilo ha sido matado. Limpiando."
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "En espera de %d hijos para salir"
diff --git a/cinder/locale/fr/LC_MESSAGES/cinder-log-error.po b/cinder/locale/fr/LC_MESSAGES/cinder-log-error.po
index 4fbf8520954..18717684eff 100644
--- a/cinder/locale/fr/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/fr/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-09-01 20:31+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/cinder/language/"
 "fr/)\n"
@@ -29,6 +29,14 @@ msgstr "Exception d'origine en cours de suppression : %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Exception inattendue survenue %d fois... Nouvel essai."
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "dans l'appel en boucle de durée fixe"
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "dans l'appel en boucle dynamique"
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr "Aucun gestionnaire pour les correspondances de type %s"
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr "Règle %r incompréhensible"
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr "Exception pendant le nettoyage rpc."
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "Exception non gérée"
diff --git a/cinder/locale/fr/LC_MESSAGES/cinder-log-info.po b/cinder/locale/fr/LC_MESSAGES/cinder-log-info.po
index 349de5e0b3b..008bf15c70e 100644
--- a/cinder/locale/fr/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/fr/LC_MESSAGES/cinder-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-17 17:40+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/cinder/language/"
 "fr/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr "Eventlet backdoor en écoute sur le port %(port)s for process %(pid)d"
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -28,3 +33,55 @@ msgstr "Tâche périodique %(task)s ignorée car son intervalle est négatif"
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "Tâche périodique %(task)s car elle est désactivée"
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "%s interceptée, sortie"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "Processus parent arrêté de manière inattendue, sortie"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr "L'enfant a reçu %s, sortie"
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "Bifurcation trop rapide, pause"
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "Enfant démarré %d"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "Démarrage des travailleurs %d"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "Enfant %(pid)d arrêté par le signal %(sig)d"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "Processus fils %(pid)s terminé avec le status %(code)d"
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "%s interceptée, arrêt de l'enfant"
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr "Pause demandée après suppression de thread. Nettoyage."
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "En attente %d enfants pour sortie"
diff --git a/cinder/locale/fr/LC_MESSAGES/cinder-log-warning.po b/cinder/locale/fr/LC_MESSAGES/cinder-log-warning.po
index b822ff8d22c..b17fe45ea5e 100644
--- a/cinder/locale/fr/LC_MESSAGES/cinder-log-warning.po
+++ b/cinder/locale/fr/LC_MESSAGES/cinder-log-warning.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:08+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/cinder/language/"
 "fr/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: cinder/openstack/common/loopingcall.py:87
+#, python-format
+msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
+msgstr ""
+
 #: cinder/openstack/common/network_utils.py:146
 msgid "tcp_keepidle not available on your system"
 msgstr "tcp_keepidle n'est pas disponible sur votre système"
@@ -30,3 +35,8 @@ msgstr "tcp_keepintvl n'est pas disponible sur votre système"
 #: cinder/openstack/common/network_utils.py:160
 msgid "tcp_keepknt not available on your system"
 msgstr "tcp_keepknt n'est pas disponible sur votre système"
+
+#: cinder/openstack/common/service.py:364
+#, python-format
+msgid "pid %d not in child list"
+msgstr "PID %d absent de la liste d'enfants"
diff --git a/cinder/locale/it/LC_MESSAGES/cinder-log-error.po b/cinder/locale/it/LC_MESSAGES/cinder-log-error.po
index bc535815057..41bf8176089 100644
--- a/cinder/locale/it/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/it/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/cinder/language/"
 "it/)\n"
@@ -22,12 +22,20 @@ msgstr ""
 #: cinder/openstack/common/excutils.py:76
 #, python-format
 msgid "Original exception being dropped: %s"
-msgstr ""
+msgstr "Eccezione originale in corso di eliminazione: %s"
 
 #: cinder/openstack/common/excutils.py:105
 #, python-format
 msgid "Unexpected exception occurred %d time(s)... retrying."
-msgstr ""
+msgstr "Un errore inatteso si è verificato %d volte... ritento."
+
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "chiamata in loop a durata fissa"
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "chiamata in loop dinamico"
 
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
@@ -42,9 +50,17 @@ msgstr ""
 #: cinder/openstack/common/policy.py:518
 #, python-format
 msgid "No handler for matches of kind %s"
-msgstr ""
+msgstr "Nessun gestore per le corrispondenze di tipo %s"
 
 #: cinder/openstack/common/policy.py:788
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr ""
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr "Eccezioni durante pulitura rpc."
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "Eccezione non gestita"
diff --git a/cinder/locale/it/LC_MESSAGES/cinder-log-info.po b/cinder/locale/it/LC_MESSAGES/cinder-log-info.po
index c5f9dfac896..800bc922c87 100644
--- a/cinder/locale/it/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/it/LC_MESSAGES/cinder-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/cinder/language/"
 "it/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr ""
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -29,3 +34,55 @@ msgstr ""
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "Abbadono dell'attività periodica %(task)s perché è disabilitata"
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "Rilevato %s, esistente"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "Il processo principale è stato interrotto inaspettatamente, uscire"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr "Cogliere Child %s, uscendo"
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "Sblocco troppo veloce, attendere"
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "Child avviato %d"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "Avvio %d operatori"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "Child %(pid)d interrotto dal segnale %(sig)d"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "Child %(pid)s terminato con stato %(code)d"
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "Intercettato %s, arresto in corso dei children"
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr "Attendere la chiamata dopo l'uccisione de filo. Bonifica."
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "In attesa %d degli elementi secondari per uscire"
diff --git a/cinder/locale/ja/LC_MESSAGES/cinder-log-error.po b/cinder/locale/ja/LC_MESSAGES/cinder-log-error.po
index 7a82d481eb0..01a73a4a0bf 100644
--- a/cinder/locale/ja/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/ja/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-09-01 20:31+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/cinder/language/"
 "ja/)\n"
@@ -29,6 +29,14 @@ msgstr "除去される元の例外: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "予期せぬ例外が、%d回()発生しました。再試行中。"
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "一定期間の呼び出しループ"
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "動的呼び出しループ"
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr "種類 %s の一致向けのハンドラーがありません"
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr "ルール %r を解釈できませんでした"
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr "RPCクリーンアップ中に例外が発生"
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "未処理例外"
diff --git a/cinder/locale/ja/LC_MESSAGES/cinder-log-info.po b/cinder/locale/ja/LC_MESSAGES/cinder-log-info.po
index 64a9978dbc1..a6932270b72 100644
--- a/cinder/locale/ja/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/ja/LC_MESSAGES/cinder-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/cinder/language/"
 "ja/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr "Eventlet backdoorは、プロセス%(pid)dの%(port)sをリスニングしています。"
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -28,3 +33,55 @@ msgstr "タスクの間隔が負であるため、定期タスク %(task)s を
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "タスクが使用不可であるため、定期タスク %(task)s をスキップしています"
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "%s が見つかりました。終了しています"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "親プロセスが予期せずに停止しました。終了しています"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr ""
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "fork が早すぎます。スリープ状態にしています"
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "子 %d を開始しました"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "%d ワーカーを開始しています"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "子 %(pid)d がシグナル %(sig)d によって強制終了されました"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "子 %(pid)s が状況 %(code)d で終了しました"
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "%s が見つかりました。子を停止しています"
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr ""
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "%d 個の子で終了を待機しています"
diff --git a/cinder/locale/ko_KR/LC_MESSAGES/cinder-log-error.po b/cinder/locale/ko_KR/LC_MESSAGES/cinder-log-error.po
index b5c91f40e10..144990fc767 100644
--- a/cinder/locale/ko_KR/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/ko_KR/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-09-01 20:31+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/cinder/"
 "language/ko_KR/)\n"
@@ -29,6 +29,14 @@ msgstr "기존 예외가 삭제됨: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "예기치 않은 예외 %d 번 발생하였습니다... 다시 시도중."
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "고정 기간 루프 호출에서"
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "동적 루프 호출에서"
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr "%s 유형의 일치에 대한 핸들러가 없음"
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr "룰 %r를 이해하지 못했습니다."
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr ""
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "처리되지 않은 예외"
diff --git a/cinder/locale/ko_KR/LC_MESSAGES/cinder-log-info.po b/cinder/locale/ko_KR/LC_MESSAGES/cinder-log-info.po
index 995c09425e0..ede2bc6ce5b 100644
--- a/cinder/locale/ko_KR/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/ko_KR/LC_MESSAGES/cinder-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/cinder/"
 "language/ko_KR/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr "Eventlet 백도어는 프로세스 %(pid)d 일 동안 %(port)s에서 수신"
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -28,3 +33,55 @@ msgstr "간격이 음수이기 때문에 주기적 태스크 %(task)s을(를) 
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "사용 안하기 때문에 주기적 태스크 %(task)s을(를) 건너뜀"
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "%s 발견, 종료 중"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "상위 프로세스가 예기치 않게 정지했습니다. 종료 중"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr ""
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "포크가 너무 빠름. 정지 중"
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "%d 하위를 시작했음"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "%d 작업자 시작 중"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "%(pid)d 하위가 %(sig)d 신호에 의해 강제 종료됨"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "%(pid)s 하위가 %(code)d 상태와 함께 종료했음"
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "%s 발견, 하위 중지 중"
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr ""
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "%d 하위에서 종료하기를 대기 중임"
diff --git a/cinder/locale/pt_BR/LC_MESSAGES/cinder-log-error.po b/cinder/locale/pt_BR/LC_MESSAGES/cinder-log-error.po
index 92d6b4c4d56..7c07b5f5d10 100644
--- a/cinder/locale/pt_BR/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/pt_BR/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-09-01 20:31+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "cinder/language/pt_BR/)\n"
@@ -29,6 +29,14 @@ msgstr "Exceção original sendo descartada: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Exceção não esperada ocorreu %d vez(es)... tentando novamente."
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "em uma chamada de laço de duração fixa"
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "em chamada de laço dinâmico"
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr "Nenhum manipulador para correspondências do tipo %s"
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr "Falha ao interpretar regra %r"
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr "Exceção durante limpeza de RPC."
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "Exceção não tratada"
diff --git a/cinder/locale/pt_BR/LC_MESSAGES/cinder-log-info.po b/cinder/locale/pt_BR/LC_MESSAGES/cinder-log-info.po
index 8e86f5abac8..8427521ce78 100644
--- a/cinder/locale/pt_BR/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/pt_BR/LC_MESSAGES/cinder-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "cinder/language/pt_BR/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr "Backdoor de Eventlet escutando na porta %(port)s pelo processo %(pid)d"
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -28,3 +33,55 @@ msgstr "Ignorando tarefa periódica %(task)s porque seu intervalo é negativo"
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "Ignorando tarefa periódica %(task)s porque ela está desativada"
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "%s capturadas, saindo"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "Processo pai saiu inesperadamente, saindo"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr ""
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "Bifurcação muito rápida, suspendendo"
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "Filho %d iniciado"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "Iniciando %d trabalhadores"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "%(pid)d filho eliminado pelo sinal %(sig)d"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "Filho %(pid)s encerrando com status %(code)d"
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "%s capturado, parando filhos"
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr ""
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "Aguardando em %d filhos para sair"
diff --git a/cinder/locale/ru/LC_MESSAGES/cinder-log-error.po b/cinder/locale/ru/LC_MESSAGES/cinder-log-error.po
index cad1349ddde..c452ec2082d 100644
--- a/cinder/locale/ru/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/ru/LC_MESSAGES/cinder-log-error.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
 "PO-Revision-Date: 2014-08-07 07:52+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/cinder/language/"
@@ -30,6 +30,14 @@ msgstr ""
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr ""
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr ""
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -49,3 +57,11 @@ msgstr ""
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr ""
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr ""
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr ""
diff --git a/cinder/locale/te_IN/LC_MESSAGES/cinder-log-error.po b/cinder/locale/te_IN/LC_MESSAGES/cinder-log-error.po
index 237ec2796ac..244b3c4eccc 100644
--- a/cinder/locale/te_IN/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/te_IN/LC_MESSAGES/cinder-log-error.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
 "PO-Revision-Date: 2014-08-07 07:52+0000\n"
 "Last-Translator: Malyadri Beegala <malyadri.beegala@gmail.com>\n"
 "Language-Team: Telugu (India) (http://www.transifex.com/projects/p/cinder/"
@@ -30,6 +30,14 @@ msgstr ""
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr ""
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr ""
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -49,3 +57,11 @@ msgstr ""
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr ""
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr ""
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr ""
diff --git a/cinder/locale/te_IN/LC_MESSAGES/cinder-log-info.po b/cinder/locale/te_IN/LC_MESSAGES/cinder-log-info.po
index e2896c28186..ea3e3c137ed 100644
--- a/cinder/locale/te_IN/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/te_IN/LC_MESSAGES/cinder-log-info.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
-"Last-Translator: Malyadri Beegala <malyadri.beegala@gmail.com>\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Telugu (India) (http://www.transifex.com/projects/p/cinder/"
 "language/te_IN/)\n"
 "Language: te_IN\n"
@@ -20,6 +20,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr ""
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -29,3 +34,55 @@ msgstr "దాని విరామం ప్రతికూల ఎందుక
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr " నియమితకాలపు పనిని ఎన్నుకొలేదు కావున నియమితకాలపు పనులను %(task)s దాటవేయడం జరిగింది."
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "%s క్యాచ్ నిష్క్రమించే"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "parrent  ప్రక్రియ నిష్క్రమించే, అనుకోకుండా మరణించాడు,"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr "చైల్డ్ నిష్క్రమించే,%s క్యాచ్"
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "Forking చాలా వేగంగా, పడుకుంది "
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "మొదలైంది పిల్లల%d"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "%d కార్మికులు ప్రారంభిస్తోంది"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "చైల్డ్ %(pid)d సిగ్నల్ ద్వారా హత్య %(sig)d"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "చైల్డ్ %(pid)s స్థితి తో నిష్క్రమించారు %(code)d  "
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr " పిల్లలు ఆపటం %s దోరికిను "
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr "థ్రెడ్ మృతి తర్వాత అని వేచి. క్లీనింగ్ అప్."
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "%d పిల్లల వెయిటింగ్ నిష్క్రమణ"
diff --git a/cinder/locale/te_IN/LC_MESSAGES/cinder-log-warning.po b/cinder/locale/te_IN/LC_MESSAGES/cinder-log-warning.po
index 472a0763784..738b433eaa7 100644
--- a/cinder/locale/te_IN/LC_MESSAGES/cinder-log-warning.po
+++ b/cinder/locale/te_IN/LC_MESSAGES/cinder-log-warning.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:08+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
-"Last-Translator: Malyadri Beegala <malyadri.beegala@gmail.com>\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Telugu (India) (http://www.transifex.com/projects/p/cinder/"
 "language/te_IN/)\n"
 "Language: te_IN\n"
@@ -20,6 +20,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: cinder/openstack/common/loopingcall.py:87
+#, python-format
+msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
+msgstr ""
+
 #: cinder/openstack/common/network_utils.py:146
 msgid "tcp_keepidle not available on your system"
 msgstr "tcp_keepidle మీ సిస్టమ్ నందు లభించలేదు"
@@ -31,3 +36,8 @@ msgstr "tcp_keepintvl మీ సిస్టమ్ నందు లభించ
 #: cinder/openstack/common/network_utils.py:160
 msgid "tcp_keepknt not available on your system"
 msgstr "tcp_keepknt మీ సిస్టమ్ నందు లభించలేదు"
+
+#: cinder/openstack/common/service.py:364
+#, python-format
+msgid "pid %d not in child list"
+msgstr "pid %d  బాల జాబితా లేదు "
diff --git a/cinder/locale/tr_TR/LC_MESSAGES/cinder-log-error.po b/cinder/locale/tr_TR/LC_MESSAGES/cinder-log-error.po
index 677f16467d8..f56fe36ffcb 100644
--- a/cinder/locale/tr_TR/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/tr_TR/LC_MESSAGES/cinder-log-error.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
 "PO-Revision-Date: 2014-08-07 07:52+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/cinder/"
@@ -29,6 +29,14 @@ msgstr ""
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr ""
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr ""
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr ""
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr ""
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr ""
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr ""
diff --git a/cinder/locale/vi_VN/LC_MESSAGES/cinder-log-error.po b/cinder/locale/vi_VN/LC_MESSAGES/cinder-log-error.po
index e00cb7a4c81..fcad9e9820b 100644
--- a/cinder/locale/vi_VN/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/vi_VN/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-09-01 20:31+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/"
 "cinder/language/vi_VN/)\n"
@@ -29,6 +29,14 @@ msgstr "Ngoại lệ ban đầu được giảm xuống: %s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Ngoại lệ bất ngờ xảy ra %d thời gian(s) ... thử lại"
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "trong cuộc gọi vòng lặp thời khoảng cố định "
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "trong cuộc gọi lặp động"
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr "Không có bộ xử lý thích ứng của loại %s"
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr "Không hiểu luật %r"
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr "Ngoại lệ trong quá trình dọn dẹp RPC"
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "ngoại lệ không được quản lý"
diff --git a/cinder/locale/zh_CN/LC_MESSAGES/cinder-log-error.po b/cinder/locale/zh_CN/LC_MESSAGES/cinder-log-error.po
index fb9943a9d9c..46c531b55fa 100644
--- a/cinder/locale/zh_CN/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/zh_CN/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-09-01 20:31+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/cinder/"
 "language/zh_CN/)\n"
@@ -29,6 +29,14 @@ msgstr "正在删除原始异常：%s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "意外的异常已发生 %d 次...正在重试。"
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "在固定时段内循环调用"
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "在动态循环调用中"
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr "对于类型为 %s 的匹配项，不存在任何处理程序"
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr "未能理解规则 %r "
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr "在RPC清除期间发生异常。"
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "存在未处理的异常"
diff --git a/cinder/locale/zh_CN/LC_MESSAGES/cinder-log-info.po b/cinder/locale/zh_CN/LC_MESSAGES/cinder-log-info.po
index 0d077715a79..9ee7558a04b 100644
--- a/cinder/locale/zh_CN/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/zh_CN/LC_MESSAGES/cinder-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/cinder/"
 "language/zh_CN/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr ""
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -28,3 +33,55 @@ msgstr "正在跳过周期性任务 %(task)s，因为其时间间隔为负"
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "正在跳过周期性任务 %(task)s，因为它已禁用"
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "捕获到 %s，正在退出"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "父进程已意外终止，正在退出"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr ""
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "派生速度太快，正在休眠"
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "已启动子代 %d"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "正在启动 %d 工作程序"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "信号 %(sig)d 已终止子代 %(pid)d"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "子代 %(pid)s 已退出，状态为 %(code)d"
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "捕获到 %s，正在停止子代"
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr ""
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "正在等待 %d 个子代退出"
diff --git a/cinder/locale/zh_TW/LC_MESSAGES/cinder-log-error.po b/cinder/locale/zh_TW/LC_MESSAGES/cinder-log-error.po
index 5d40958245c..0823e2d9b4d 100644
--- a/cinder/locale/zh_TW/LC_MESSAGES/cinder-log-error.po
+++ b/cinder/locale/zh_TW/LC_MESSAGES/cinder-log-error.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-08 06:09+0000\n"
-"PO-Revision-Date: 2014-09-01 20:31+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/cinder/"
 "language/zh_TW/)\n"
@@ -29,6 +29,14 @@ msgstr "正在捨棄原始異常狀況：%s"
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr ""
 
+#: cinder/openstack/common/loopingcall.py:95
+msgid "in fixed duration looping call"
+msgstr "在固定持續時間的迴圈呼叫中"
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr "在動態迴圈呼叫中"
+
 #: cinder/openstack/common/periodic_task.py:202
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
@@ -48,3 +56,11 @@ msgstr "類型為 %s 的相符項沒有處理程式"
 #, python-format
 msgid "Failed to understand rule %r"
 msgstr "理解規則 %r 時失敗"
+
+#: cinder/openstack/common/service.py:188
+msgid "Exception during rpc cleanup."
+msgstr ""
+
+#: cinder/openstack/common/service.py:277
+msgid "Unhandled exception"
+msgstr "無法處理的異常狀況"
diff --git a/cinder/locale/zh_TW/LC_MESSAGES/cinder-log-info.po b/cinder/locale/zh_TW/LC_MESSAGES/cinder-log-info.po
index 63ccd4bc1c5..0d234453584 100644
--- a/cinder/locale/zh_TW/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/zh_TW/LC_MESSAGES/cinder-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-09 06:07+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
+"POT-Creation-Date: 2014-09-24 06:03+0000\n"
+"PO-Revision-Date: 2014-09-13 22:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/cinder/"
 "language/zh_TW/)\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: cinder/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr ""
+
 #: cinder/openstack/common/periodic_task.py:126
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
@@ -28,3 +33,55 @@ msgstr "正在跳過定期作業 %(task)s，因為其間隔為負數"
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "正在跳過定期作業 %(task)s，因為它已停用"
+
+#: cinder/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "已捕捉到 %s，正在結束"
+
+#: cinder/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "母程序已非預期地當掉，正在結束"
+
+#: cinder/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr ""
+
+#: cinder/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "分岔太快，正在休眠"
+
+#: cinder/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "已開始子行程 %d"
+
+#: cinder/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "正在啟動 %d 個工作程式"
+
+#: cinder/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "信號 %(sig)d 結束了子項 %(pid)d"
+
+#: cinder/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "子項 %(pid)s 已結束，狀態為 %(code)d"
+
+#: cinder/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "已捕捉到 %s，正在停止子項"
+
+#: cinder/openstack/common/service.py:408
+msgid "Wait called after thread killed.  Cleaning up."
+msgstr ""
+
+#: cinder/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "正在等待 %d 個子項結束"