Merge "Fix HNAS driver confusing error message (iSCSI driver)"

diff --cc cinder/volume/drivers/hds/iscsi.py
index 24d2b2ad4f0d19fc1fc70190813de2eccc75af9f,8a3334ec253b044531703b11b05c48501cfb8229..9ebab41ffe927fc2989b07209d4bad7100a917a3
--- 1/cinder/volume/drivers/hds/iscsi.py
--- 2/cinder/volume/drivers/hds/iscsi.py
+++ b/cinder/volume/drivers/hds/iscsi.py
@@@ -17,15 -17,15 +17,15 @@@
  """
  iSCSI Cinder Volume driver for Hitachi Unified Storage (HUS-HNAS) platform.
  """
- 
+ import os
  from xml.etree import ElementTree as ETree
  
 -from oslo.utils import excutils
 -from oslo.utils import units
  from oslo_config import cfg
 +from oslo_utils import excutils
 +from oslo_utils import units
  
  from cinder import exception
- from cinder.i18n import _LE, _LI
+ from cinder.i18n import _LE, _LI, _LW
  from cinder.openstack.common import log as logging
  from cinder.volume import driver
  from cinder.volume.drivers.hds.hnas_backend import HnasBackend

diff --cc cinder/volume/drivers/hds/nfs.py
Simple merge