Merge "ProphetStor with pool aware cinder scheduler"

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

diff --cc cinder/volume/drivers/prophetstor/dplcommon.py
index 669c1ba16cd51f089940b57e489f5787dc226740,d18d53c35137ae547a58fc5fcd5a656f40a09548..e719de1a64eaea16dcfbfbb1d2a69ccc23bb6051
--- 1/cinder/volume/drivers/prophetstor/dplcommon.py
--- 2/cinder/volume/drivers/prophetstor/dplcommon.py
+++ b/cinder/volume/drivers/prophetstor/dplcommon.py
@@@ -28,9 -28,10 +29,9 @@@ from oslo.utils import unit
  import six
  
  from cinder import exception
- from cinder.i18n import _, _LE, _LI
+ from cinder.i18n import _, _LI, _LW, _LE
  from cinder.openstack.common import log as logging
  from cinder.openstack.common import loopingcall
 -from cinder.openstack.common import units
  from cinder.volume import driver
  from cinder.volume.drivers.prophetstor import options
  from cinder.volume.drivers.san import san