Merge "VMware: Fix missing target resource pool"

diff --cc cinder/tests/test_vmware_vmdk.py
Simple merge

diff --cc cinder/tests/test_vmware_volumeops.py
Simple merge

diff --cc cinder/volume/drivers/vmware/vmdk.py
index 338765f84b1d00317b818757ffae5b853556bd30,49c2c9f8c117d214b400030dd5bd268d29932537..c8c2eab3f71b10661f55d22087855ed8bee4259c
--- 1/cinder/volume/drivers/vmware/vmdk.py
--- 2/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@@ -1535,10 -1502,10 +1536,10 @@@ class VMwareEsxVmdkDriver(driver.Volume
                      new_backing = self.volumeops.clone_backing(
                          volume['name'], backing, None,
                          volumeops.FULL_CLONE_TYPE, datastore, new_disk_type,
-                         host)
+                         host, rp)
                      self._delete_temp_backing(backing)
                      backing = new_backing
 -                except error_util.VimException:
 +                except exceptions.VimException:
                      with excutils.save_and_reraise_exception():
                          LOG.exception(_LE("Error occurred while cloning "
                                            "backing:"

diff --cc cinder/volume/drivers/vmware/volumeops.py
Simple merge